Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3.6 nomadic #481

Draft
wants to merge 81 commits into
base: 3.6
Choose a base branch
from
Draft

3.6 nomadic #481

wants to merge 81 commits into from

Commits on Oct 22, 2014

  1. modification affichage liste déroulante sélection produit pour affich… 

    …er le stock de l'entrepot "Neuf"
    geoffrey.girard committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    1a1601b View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2014

  1. ajout module Margin : possibilité de choisir PMP produit en tant que … 

    …prix de revient + choix PMP par défaut => configuration du module
    geoffrey.girard committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    3e340a7 View commit details
    Browse the repository at this point in the history

  2. ajout conf module Marge : affectation invisible prix de revient si dr… 

    …oit utilisateur insufisant
    geoffrey.girard committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    9a0264a View commit details
    Browse the repository at this point in the history

  3. modification classe livraison pour prise en compte qty restante à liv… 

    …ré dans le pdf
    geoffrey.girard committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    fa085cb View commit details
    Browse the repository at this point in the history

  4. modif expédition : prise en compte de toutes les ligne même si qty = 0

    geoffrey.girard committed Oct 23, 2014
    Configuration menu
    Copy the full SHA
    6cf49eb View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2014

  1. récupération code develop propre pour non prise en compte des produit… 

    …s expédition qty = 0 dans facture
    geoffrey.girard committed Oct 24, 2014
    Configuration menu
    Copy the full SHA
    15b14ad View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2014

  1. Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into 3.6_n… 

    …omadic
    @atm-gauthier
    atm-gauthier committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    de5ed73 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2014

  1. ajout administration extrafields sur ligne de commande et facture fou… 

    …rnisseur
    geoffrey.girard committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    262d058 View commit details
    Browse the repository at this point in the history

  2. création table extrafields ligne commande facture fournisseur

    geoffrey.girard committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    1694edb View commit details
    Browse the repository at this point in the history

  3. debug

    geoffrey.girard committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    90c0161 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2014

  1. préparation modèle LCR : TODO Debug

    geoffrey.girard committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    a868c68 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2014

  1. cosmétique modèle LCR

    geoffrey.girard committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    9bb3798 View commit details
    Browse the repository at this point in the history

  2. ajout filtre spécific sur société dans destinataires emailing

    geoffrey.girard committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    ac5a7d8 View commit details
    Browse the repository at this point in the history

  3. rajout $no_trigger sur fonction validate de la classe facture

    @atm-gauthier
    atm-gauthier committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    921640c View commit details
    Browse the repository at this point in the history

  4. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    @atm-gauthier
    atm-gauthier committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    7def145 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2014

  1. debug filtre spécifique destinataires

    geoffrey.girard committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    f04f5c1 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    geoffrey.girard committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    4315201 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2014

  1. debug afficahge extrafields

    geoffrey.girard committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    72aebcd View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2014

  1. ajout class liste sur liste commande et liste commande fournisseur

    geoffrey.girard committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    becea54 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2014

  1. Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic 

    Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/class/product.class.php
    @atm-maxime
    atm-maxime committed Nov 20, 2014
    Configuration menu
    Copy the full SHA
    26d29c1 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2014

  1. ajout appel de hook + debug

    geoffrey.girard committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    85da51a View commit details
    Browse the repository at this point in the history

  2. debug extrafields workflow

    geoffrey.girard committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    adc16ed View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2014

  1. Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic

    root authored and root committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    99b46b3 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic 

    Conflicts:
	htdocs/commande/class/commande.class.php
    @atm-maxime
    atm-maxime committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    33ccacc View commit details
    Browse the repository at this point in the history

  3. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    root authored and root committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    a70dff0 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2014

  1. Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic

    root authored and root committed Dec 6, 2014
    Configuration menu
    Copy the full SHA
    d0ad9a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2014

  1. debug gestion des extrafields

    geoffrey.girard committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    9129a84 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    geoffrey.girard committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    8ec1d4a View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. debug référence expédition et commande sur facture pfdf

    geoffrey.girard committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    30ac6cd View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Cosmetique

    root authored and root committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    ab905a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2015

  1. Etat/pourcentage "A realiser" par defaut sur fiche nouvel evenement a… 

    …genda
    @atm-gauthier
    atm-gauthier committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    abab541 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Ticket 1744 : TVA 0 si tiers non assujetti à la TVA

    @atm-maxime
    atm-maxime committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    c4619e2 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    @atm-maxime
    atm-maxime committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    3c0d159 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2015

  1. debug

    geoffrey.girard committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    ec39302 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2015

  1. Correction liens création evenement 

    	modified:   ../../core/lib/company.lib.php
    root authored and root committed Feb 27, 2015
    Configuration menu
    Copy the full SHA
    2207a0f View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2015

  1. ajout appel de hook

    geoffrey.girard committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    8fd8441 View commit details
    Browse the repository at this point in the history

  2. modification : possibilité de modifier les extrafields d'une commande… 

    … fourn quel que soit son statut
    geoffrey.girard committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    1e332ad View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2015

  1. Merge branch '3.6' of github.com:ATM-Consulting/dolibarr into 3.6_nom… 

    …adic

Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/product/class/product.class.php
    @atm-maxime
    atm-maxime committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    5a62575 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2015

  1. Afficahge stock entrepot neuf sur liste produit

    @atm-maxime
    atm-maxime committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    f9c9a76 View commit details
    Browse the repository at this point in the history

  2. Modif non commitée dans product.class

    root authored and root committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    68559a2 View commit details
    Browse the repository at this point in the history

  3. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    root authored and root committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    ce5b5e2 View commit details
    Browse the repository at this point in the history

  4. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    root authored and root committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    b5042b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2015

  1. affichage du pu ht sur liste objets référents sur onglet fiche tiers.

    @atm-gauthier
    atm-gauthier committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    377bd6b View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2015

  1. debug

    root authored and root committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    57e4dea View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. modification appel du hook pdf_writlinedesc

    geoffrey.girard committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    baa78e6 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2015

  1. Affichage des méthodes d'expédition même si aucun numéro de suivi spé… 

    …cifié
    @atm-maximep
    atm-maximep committed May 4, 2015
    Configuration menu
    Copy the full SHA
    df3d03f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2015

  1. FIX : affichage shipping_method sans tracking_number

    geoffrey.girard committed May 5, 2015
    Configuration menu
    Copy the full SHA
    21d866b View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. FIX : Conserver le modèle PDF sélectionné lorsque l'on modifie une ex… 

    …pédition
    @atm-maximep
    atm-maximep committed May 11, 2015
    Configuration menu
    Copy the full SHA
    eb80f52 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2015

  1. FIX : fetch de l'objet société dans getNomURL pour que l'affichage du… 

    … code client/fournisseur dans le titre fonctionne partout avec la constante SOCIETE_ADD_REF_IN_LIST
    @atm-gauthier
    atm-gauthier committed May 19, 2015
    Configuration menu
    Copy the full SHA
    f625e1f View commit details
    Browse the repository at this point in the history

  2. NEW : code client et fourn à droite du nom du tiers

    @atm-gauthier
    atm-gauthier committed May 19, 2015
    Configuration menu
    Copy the full SHA
    1bff2c9 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2015

  1. FIX send mail, copy sendto don't read the list of contact 

    Conflicts:
	htdocs/comm/propal.php
	htdocs/compta/facture.php
    Alexis Algoud authored and phf committed May 21, 2015
    Configuration menu
    Copy the full SHA
    0d1b1ea View commit details
    Browse the repository at this point in the history

  2. FIX : envoi email copie via selectlist sur commande 

    Conflicts:
	htdocs/commande/fiche.php
    phf committed May 21, 2015
    Configuration menu
    Copy the full SHA
    df25542 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2015

  1. Fix : stats facture graph accueil ne filtrait pas les acomptes

    @atm-maxime
    atm-maxime committed May 22, 2015
    Configuration menu
    Copy the full SHA
    5dcd685 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2015

  1. filtrage entrepôt neuf sur replanish

    geoffrey.girard committed May 25, 2015
    Configuration menu
    Copy the full SHA
    893aaa1 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2015

  1. Correction envoi mail depuis fiche facture

    @atm-maximep
    atm-maximep committed May 27, 2015
    Configuration menu
    Copy the full SHA
    aef4e89 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. Correction envoi mail depusi fiche commande

    @atm-maximep
    atm-maximep committed May 28, 2015
    Configuration menu
    Copy the full SHA
    8e462e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2015

  1. FIX : envoi de mail via propale ( a continuer)

    geoffrey.girard committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    9619688 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2015

  1. Correction conditions ajout adresse en cc

    @atm-maximep
    atm-maximep committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    fbf2fbc View commit details
    Browse the repository at this point in the history

  2. FIX : Envoi des expéditions par mail

    @atm-maximep
    atm-maximep committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    6ce8c2f View commit details
    Browse the repository at this point in the history

  3. FIX : Envoi de factures fournisseurs

    @atm-maximep
    atm-maximep committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    43fed6e View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2015

  1. FIX send mail

    phf committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    56dd6a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. Merge branch '3.6' of https://github.com/Dolibarr/dolibarr into 3.6_n… 

    …omadic

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/fiche.php
	htdocs/product/fournisseurs.php
    @atm-gauthier
    atm-gauthier committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    5a5f568 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2015

  1. Envoi bons expédition

    @atm-maximep
    atm-maximep committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    48f19ae View commit details
    Browse the repository at this point in the history

  2. Modification PDF Rouget pour éviter d'afficher deux fois le numéro de… 

    … suivi
    @atm-maximep
    atm-maximep committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    418c166 View commit details
    Browse the repository at this point in the history

  3. debug affichage PDF rouget

    @atm-maximep
    atm-maximep committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    786b7d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. FIX : note et infos nomadic se chevauchent

    @atm-gauthier
    atm-gauthier committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    b00e517 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. Ajout rowid sur fetch ligne expédition sinon pas d'origin id sur créa… 

    …tion facture
    @atm-maxime
    atm-maxime committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    1add2bf View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6' of github.com:ATM-Consulting/dolibarr into 3.6_nom… 

    …adic

Conflicts:
	htdocs/product/class/product.class.php
	htdocs/societe/consumption.php
    @atm-maxime
    atm-maxime committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    c0ed937 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. Fix : extrafield CF => SI

    @atm-maxime
    atm-maxime committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    c77b18c View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. ADD : fonction pour calculer le nombre de produit expédié suivant un … 

    …période
    geoffrey.girard committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    9ed646a View commit details
    Browse the repository at this point in the history

  2. FIX

    geoffrey.girard committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    6e85414 View commit details
    Browse the repository at this point in the history

  3. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    geoffrey.girard committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    5cc02bc View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. FIX Ticket 3846

    @FHenry
    FHenry committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    0c665ef View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. FIX php 7.0 strict

    @atm-florian
    atm-florian committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    5bf597c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2016

  1. Traductions pour délais de livraison perso (tk 4922)

    root authored and root committed Oct 11, 2016
    Configuration menu
    Copy the full SHA
    fdba913 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2017

  1. FIX creer facture acompte

    @atm-arnaud
    atm-arnaud committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    addd5d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6_nomadic' of github.com:ATM-Consulting/dolibarr into… 

    … 3.6_nomadic
    @atm-arnaud
    atm-arnaud committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    61b57eb View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. FIX prix à 0 facture fourn

    @atm-arnaud
    atm-arnaud committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    54de889 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2017

  1. Fix tk6477 - traduction de clé issue d'un dictionnaire

    atm-ph authored and atm-ph committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    b313ce7 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. FIX: messy require

    root authored and root committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    3ebadc0 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. [PH] Fix erreur 500 can not redeclare class Commande

    Alexis serveur clone committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    76e138c View commit details
    Browse the repository at this point in the history