[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a814e0: FIX : margin tab on customer
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a814e0: FIX : margin tab on customer card must filter on c... |
Date: |
Sat, 29 Oct 2016 10:01:26 -0700 |
Branch: refs/heads/4.0
Home: https://github.com/Dolibarr/dolibarr
Commit: a814e02d5349528199fc7c0f41209e60352b8394
https://github.com/Dolibarr/dolibarr/commit/a814e02d5349528199fc7c0f41209e60352b8394
Author: gauthier <address@hidden>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
FIX : margin tab on customer card must filter on current entity invoices
Commit: e4da87d31ca798d98850f19c2ef55967ba4ee5fd
https://github.com/Dolibarr/dolibarr/commit/e4da87d31ca798d98850f19c2ef55967ba4ee5fd
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-24 (Mon, 24 Oct 2016)
Changed paths:
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #5903 from atm-gauthier/FIX_thirdparty_margin
FIX : margin tab on customer card must filter on current entity invoices
Commit: 2a4517e1bcd8f9830eec9b562b61a2e74cd16966
https://github.com/Dolibarr/dolibarr/commit/2a4517e1bcd8f9830eec9b562b61a2e74cd16966
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-10-24 (Mon, 24 Oct 2016)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
FIX: #5907
Commit: 5e7c72068df1ae743a089e98506d6cc84807f531
https://github.com/Dolibarr/dolibarr/commit/5e7c72068df1ae743a089e98506d6cc84807f531
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-26 (Wed, 26 Oct 2016)
Changed paths:
M htdocs/langs/en_US/main.lang
Log Message:
-----------
Merge pull request #5923 from olsesacl/#5907
FIX: #5907 No translation string for PDF Proposal
Commit: be493fcf09747b37c69c9124736e025c727904de
https://github.com/Dolibarr/dolibarr/commit/be493fcf09747b37c69c9124736e025c727904de
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-10-28 (Fri, 28 Oct 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Fix bad parameter in hook call
Commit: 3dbab863a77dc8b78ea876d8ebcdf4f0300853ef
https://github.com/Dolibarr/dolibarr/commit/3dbab863a77dc8b78ea876d8ebcdf4f0300853ef
Author: Maxime Kohlhaas <address@hidden>
Date: 2016-10-28 (Fri, 28 Oct 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Fix : vars were not set after commande function
Commit: 57a8e053b42663ff7db23e9176db18d358ff16ea
https://github.com/Dolibarr/dolibarr/commit/57a8e053b42663ff7db23e9176db18d358ff16ea
Author: Juanjo Menent <address@hidden>
Date: 2016-10-28 (Fri, 28 Oct 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #5936 from atm-maxime/fix_pdfmuscadet_hook_call
Fix bad parameter in hook call
Commit: 7acc14903c43234912c9d7ecebb355458053f497
https://github.com/Dolibarr/dolibarr/commit/7acc14903c43234912c9d7ecebb355458053f497
Author: Juanjo Menent <address@hidden>
Date: 2016-10-28 (Fri, 28 Oct 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #5937 from atm-maxime/fix_supporder_vars_set
Fix : vars were not set after commande function
Commit: d0bd1d5d365fa369ac3645588a687a7e186509c0
https://github.com/Dolibarr/dolibarr/commit/d0bd1d5d365fa369ac3645588a687a7e186509c0
Author: Regis Houssin <address@hidden>
Date: 2016-10-28 (Fri, 28 Oct 2016)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Fix: missing path of user photo
Commit: 7c3356baffe81aff181a92a356e96fb4256bd982
https://github.com/Dolibarr/dolibarr/commit/7c3356baffe81aff181a92a356e96fb4256bd982
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Merge pull request #5938 from hregis/3.9_bug
Fix: missing path of user photo
Commit: 7c75d98f9a6666211238e67b491ed0049f68c6e5
https://github.com/Dolibarr/dolibarr/commit/7c75d98f9a6666211238e67b491ed0049f68c6e5
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/product/stock/productlot_list.php
Log Message:
-----------
FIX #5866
Commit: 78eaeab1683ed3b5015afa19bad2a9c82bbfd054
https://github.com/Dolibarr/dolibarr/commit/78eaeab1683ed3b5015afa19bad2a9c82bbfd054
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/main.lang
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: b8f8b6dcde4806f40992fdf8921ec52d96e2e673
https://github.com/Dolibarr/dolibarr/commit/b8f8b6dcde4806f40992fdf8921ec52d96e2e673
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 17c1b3f1d2e7eaafc5939bf59281ac166f0dede4
https://github.com/Dolibarr/dolibarr/commit/17c1b3f1d2e7eaafc5939bf59281ac166f0dede4
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/main.lang
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
Commit: 2b873e34ce070feed0fa6d71dde50f7816a5a399
https://github.com/Dolibarr/dolibarr/commit/2b873e34ce070feed0fa6d71dde50f7816a5a399
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M htdocs/multicurrency/class/multicurrency.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Compare:
https://github.com/Dolibarr/dolibarr/compare/d675602291fe...2b873e34ce07