[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] fa73db: FIX #5128 if create method re
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] fa73db: FIX #5128 if create method return duplicated code ... |
|
Date: |
Thu, 21 Jul 2016 11:45:37 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: fa73dbe8e9593f719545bc0435742a8f13dabe68
https://github.com/Dolibarr/dolibarr/commit/fa73dbe8e9593f719545bc0435742a8f13dabe68
Author: Alexis Algoud <address@hidden>
Date: 2016-06-30 (Thu, 30 Jun 2016)
Changed paths:
M htdocs/langs/en_US/companies.lang
M htdocs/societe/soc.php
Log Message:
-----------
FIX #5128 if create method return duplicated code error
not use GETPOST in order to get a new code
Commit: 4503659cba8707a6ef2bc2e704d84cbc09c286c5
https://github.com/Dolibarr/dolibarr/commit/4503659cba8707a6ef2bc2e704d84cbc09c286c5
Author: Regis Houssin <address@hidden>
Date: 2016-07-06 (Wed, 06 Jul 2016)
Changed paths:
M htdocs/product/index.php
Log Message:
-----------
Fix: wrong multicompany filter
Commit: 02439bed8b8635099e560393ba3fc3405cb281f2
https://github.com/Dolibarr/dolibarr/commit/02439bed8b8635099e560393ba3fc3405cb281f2
Author: Juanjo Menent <address@hidden>
Date: 2016-07-07 (Thu, 07 Jul 2016)
Changed paths:
M htdocs/product/index.php
Log Message:
-----------
Merge pull request #5458 from hregis/3.8_bug
Fix: wrong multicompany filter
Commit: 1232e25859099c5d63b8fbaa11c77facc0a8627e
https://github.com/Dolibarr/dolibarr/commit/1232e25859099c5d63b8fbaa11c77facc0a8627e
Author: Juanjo Menent <address@hidden>
Date: 2016-07-16 (Sat, 16 Jul 2016)
Changed paths:
M htdocs/don/class/don.class.php
Log Message:
-----------
FIX #5474 Country_id of "Don" object is still empty
Commit: 587484fabb51e63e4d6db88a183127f328bd726d
https://github.com/Dolibarr/dolibarr/commit/587484fabb51e63e4d6db88a183127f328bd726d
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-16 (Sat, 16 Jul 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Prepare 3.9.3
Commit: 8a303fd4d8e1d98a11f85423eeb749417dbb4c09
https://github.com/Dolibarr/dolibarr/commit/8a303fd4d8e1d98a11f85423eeb749417dbb4c09
Author: Xebax <address@hidden>
Date: 2016-07-16 (Sat, 16 Jul 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
FIX #5493 The login field is ignored when doing a "search in all" for
members.
Commit: 653bfd5d43e1737ec3fcd8ca520d65812ded817e
https://github.com/Dolibarr/dolibarr/commit/653bfd5d43e1737ec3fcd8ca520d65812ded817e
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-16 (Sat, 16 Jul 2016)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Fix missing orig file in upload.
Commit: 25d9969590bd153451633a7e30ea4d4d0cedcb96
https://github.com/Dolibarr/dolibarr/commit/25d9969590bd153451633a7e30ea4d4d0cedcb96
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-16 (Sat, 16 Jul 2016)
Changed paths:
M build/debian/watch
Log Message:
-----------
Fix watch to use orig.tar.gz on package_ubuntu directory
Commit: 3b563700604f5afc24eea8b69e715b2d8a9a0162
https://github.com/Dolibarr/dolibarr/commit/3b563700604f5afc24eea8b69e715b2d8a9a0162
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Fix #5450
Commit: e6da7c557411aa2392c91cfe1f457c0db4809397
https://github.com/Dolibarr/dolibarr/commit/e6da7c557411aa2392c91cfe1f457c0db4809397
Author: aspangaro <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Fix: Accountancy - Problem with empty accountancy acccount in create / modify
mode
Commit: 90a84335ab8c5e9ccf708500fd39f2e5345f1821
https://github.com/Dolibarr/dolibarr/commit/90a84335ab8c5e9ccf708500fd39f2e5345f1821
Author: aspangaro <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/langs/en_US/boxes.lang
Log Message:
-----------
Fix: Missing key language on home for boxes
Commit: 5eeb630a14a27bce7856d9ab2df4355411368047
https://github.com/Dolibarr/dolibarr/commit/5eeb630a14a27bce7856d9ab2df4355411368047
Author: Juanjo Menent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/langs/en_US/boxes.lang
Log Message:
-----------
Merge pull request #5498 from aspangaro/4.0-p35
Fix: Missing key language on home for boxes
Commit: 9973f03f3bd36225bea1a17c96849ccfa3aa3747
https://github.com/Dolibarr/dolibarr/commit/9973f03f3bd36225bea1a17c96849ccfa3aa3747
Author: Juanjo Menent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge pull request #5499 from aspangaro/4.0-p34
Fix: Accountancy - Problem with empty accountancy acccount in create / update
mode
Commit: 970d088510730fed773faef66e45bde9964f7a44
https://github.com/Dolibarr/dolibarr/commit/970d088510730fed773faef66e45bde9964f7a44
Author: Juanjo Menent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Merge pull request #5494 from EuskalMoneta/bug-5493
FIX #5493 The login field is ignored when doing a "search in all" for members
Commit: 60384f6d6623be91de4357603aeb2b2d74848ebe
https://github.com/Dolibarr/dolibarr/commit/60384f6d6623be91de4357603aeb2b2d74848ebe
Author: Juanjo Menent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/don/class/don.class.php
Log Message:
-----------
Merge pull request #5492 from simnandez/3.8
FIX #5474 Country_id of "Don" object is still empty
Commit: e52d6db3fd53ec9cdde999b4e4517a6de4aaf240
https://github.com/Dolibarr/dolibarr/commit/e52d6db3fd53ec9cdde999b4e4517a6de4aaf240
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Fix #5450
Commit: 9b47d7e05d06078187c2e51655e577e180a962cc
https://github.com/Dolibarr/dolibarr/commit/9b47d7e05d06078187c2e51655e577e180a962cc
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M build/debian/dolibarr.docs
Log Message:
-----------
Keep only us file
Commit: 4382724b865d8d7ac17b76dc4a2a6c36dcf6d5fd
https://github.com/Dolibarr/dolibarr/commit/4382724b865d8d7ac17b76dc4a2a6c36dcf6d5fd
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/adherents/list.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 1914b98375e7fc6180c1efeb9558ffb85f6c9018
https://github.com/Dolibarr/dolibarr/commit/1914b98375e7fc6180c1efeb9558ffb85f6c9018
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M ChangeLog
M build/debian/dolibarr.docs
M build/debian/watch
M build/makepack-dolibarr.pl
M htdocs/adherents/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Commit: bf67cf9dc24df74a292d4df5281994cdd5efbf9d
https://github.com/Dolibarr/dolibarr/commit/bf67cf9dc24df74a292d4df5281994cdd5efbf9d
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
Log Message:
-----------
Update documentation
Commit: c37c3d1939393b749fa1057339f0b11ad9d5357b
https://github.com/Dolibarr/dolibarr/commit/c37c3d1939393b749fa1057339f0b11ad9d5357b
Author: Juanjo Menent <address@hidden>
Date: 2016-07-17 (Sun, 17 Jul 2016)
Changed paths:
M htdocs/expensereport/class/expensereport.class.php
Log Message:
-----------
Merge pull request #5496 from olsesacl/3.8_#5450
Fix #5450 Bug: Expenses Form : SQL error on updating line
Commit: bc4674bdcea071f52d6053487467b66b99db7009
https://github.com/Dolibarr/dolibarr/commit/bc4674bdcea071f52d6053487467b66b99db7009
Author: florian HENRY <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
fix problem with call update method after fetch on invocie lines
Commit: d3344f52910d41cc68caeaa530af80f23a27510b
https://github.com/Dolibarr/dolibarr/commit/d3344f52910d41cc68caeaa530af80f23a27510b
Author: florian HENRY <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
sd
Commit: e5235be7d031f7897dc02c8e48bda7127134ae9f
https://github.com/Dolibarr/dolibarr/commit/e5235be7d031f7897dc02c8e48bda7127134ae9f
Author: Juanjo Menent <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency
FIX : class FactureLine fetch() and update() crash
Commit: 5e654e8cb38468e02d84631999d70ddd47c8eec3
https://github.com/Dolibarr/dolibarr/commit/5e654e8cb38468e02d84631999d70ddd47c8eec3
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix help
Commit: 9a0367db0d754b88d66a0dc5a846f59eb0c62937
https://github.com/Dolibarr/dolibarr/commit/9a0367db0d754b88d66a0dc5a846f59eb0c62937
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 10cd5ba7305d89b653c75e06ffb222ca7a27b515
https://github.com/Dolibarr/dolibarr/commit/10cd5ba7305d89b653c75e06ffb222ca7a27b515
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/societe/notify/card.php
Log Message:
-----------
Fix sort of sent notification by date desc
Commit: 621a29d0e0ce77528d6516f49bc0c736f428fed3
https://github.com/Dolibarr/dolibarr/commit/621a29d0e0ce77528d6516f49bc0c736f428fed3
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Fix account may contains text
Commit: 2c77a901b30b8a11f084f4460f240519630a0f36
https://github.com/Dolibarr/dolibarr/commit/2c77a901b30b8a11f084f4460f240519630a0f36
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M dev/translation/sanity_check_en_langfiles.php
Log Message:
-----------
Fix to avoid removal of trnaslation key to keep
Commit: fd7c494cb672e0a2745d89fa68633fd7c2a535bd
https://github.com/Dolibarr/dolibarr/commit/fd7c494cb672e0a2745d89fa68633fd7c2a535bd
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/data/llx_c_tva.sql
Log Message:
-----------
Add VAT for cyprus
Commit: 038526bb712d77302835904876c8cc04dabaf0c5
https://github.com/Dolibarr/dolibarr/commit/038526bb712d77302835904876c8cc04dabaf0c5
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_product.sql
Log Message:
-----------
Code comment
Commit: c5ebb8f98305c9696e2feb04b66fc28c115a8d4d
https://github.com/Dolibarr/dolibarr/commit/c5ebb8f98305c9696e2feb04b66fc28c115a8d4d
Author: Juanjo Menent <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Fix bad param name to test if showing selector for suppliers
Commit: 7479933c2721b90038b2e410e4ffc9b3f5637dad
https://github.com/Dolibarr/dolibarr/commit/7479933c2721b90038b2e410e4ffc9b3f5637dad
Author: Juanjo Menent <address@hidden>
Date: 2016-07-18 (Mon, 18 Jul 2016)
Changed paths:
M dev/translation/sanity_check_en_langfiles.php
M htdocs/compta/bank/card.php
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/langs/en_US/admin.lang
M htdocs/societe/notify/card.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/4.0' into 4.0
Commit: 5ea72c8d5664a7adeedde9c37a0e12149e9bf573
https://github.com/Dolibarr/dolibarr/commit/5ea72c8d5664a7adeedde9c37a0e12149e9bf573
Author: florian HENRY <address@hidden>
Date: 2016-07-19 (Tue, 19 Jul 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
FIX : cannot update bank account on invoice if module order not
activated
Commit: 455add41303969960aa25cdf4da0503fc658ba59
https://github.com/Dolibarr/dolibarr/commit/455add41303969960aa25cdf4da0503fc658ba59
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-19 (Tue, 19 Jul 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #5505 from atm-florian/3.9_fix_editbank_invoice
FIX : cannot update bank account on invoice if module order not activated
Commit: 01c140ecacb63aacdcfe10a459be5ce926091a0b
https://github.com/Dolibarr/dolibarr/commit/01c140ecacb63aacdcfe10a459be5ce926091a0b
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-20 (Wed, 20 Jul 2016)
Changed paths:
M htdocs/comm/remx.php
Log Message:
-----------
FIX External user must not be able to edit its discounts
Commit: ffa110294984477b1385b78d2be0b1a7d2e2902b
https://github.com/Dolibarr/dolibarr/commit/ffa110294984477b1385b78d2be0b1a7d2e2902b
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-20 (Wed, 20 Jul 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 918bc9cc2621dc16423e7626a1e887da54941d16
https://github.com/Dolibarr/dolibarr/commit/918bc9cc2621dc16423e7626a1e887da54941d16
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-20 (Wed, 20 Jul 2016)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Fix: If user can approve, show button to deny to.
Commit: 6e1d7aebb30f17800e5761d334803598f8c1ff0a
https://github.com/Dolibarr/dolibarr/commit/6e1d7aebb30f17800e5761d334803598f8c1ff0a
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-20 (Wed, 20 Jul 2016)
Changed paths:
M htdocs/projet/element.php
Log Message:
-----------
Merge pull request #5504 from simnandez/4.0
Fix bad param name to test if showing selector for suppliers
Commit: 52e5403660d68fa89dd1a9515a2eb01332284e4e
https://github.com/Dolibarr/dolibarr/commit/52e5403660d68fa89dd1a9515a2eb01332284e4e
Author: aspangaro <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Fix: Presentation on thirdparty card
Commit: 9ebe7045067a77d7a79cfd6c099f5f618e38c628
https://github.com/Dolibarr/dolibarr/commit/9ebe7045067a77d7a79cfd6c099f5f618e38c628
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/langs/en_US/companies.lang
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128
FIX #5128 if create method return duplicated code error
Commit: 972d998f7edc184fc3d5a9bc3bd011f446ec73b4
https://github.com/Dolibarr/dolibarr/commit/972d998f7edc184fc3d5a9bc3bd011f446ec73b4
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/don/class/don.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/product/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: 774e3278311cf01c2539e4b6e08a1f44a36c715d
https://github.com/Dolibarr/dolibarr/commit/774e3278311cf01c2539e4b6e08a1f44a36c715d
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/comm/remx.php
M htdocs/compta/facture.php
M htdocs/don/class/don.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/langs/en_US/companies.lang
M htdocs/product/index.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/comm/remx.php
htdocs/compta/facture.php
htdocs/langs/en_US/companies.lang
Commit: 0428d9c8875f3c70b62799d9a71a23505f9c3ac5
https://github.com/Dolibarr/dolibarr/commit/0428d9c8875f3c70b62799d9a71a23505f9c3ac5
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #5525 from aspangaro/4.0-p36
Fix: Presentation on thirdparty card
Commit: ff9b2803e7dee27a2160a3f32a7539e5766dda11
https://github.com/Dolibarr/dolibarr/commit/ff9b2803e7dee27a2160a3f32a7539e5766dda11
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/projet/card.php
Log Message:
-----------
Fix if previous percent not defined, we do not try to show previous
percent.
Commit: 058c431483c3cc0dacf689cd534f66ad5350e2ce
https://github.com/Dolibarr/dolibarr/commit/058c431483c3cc0dacf689cd534f66ad5350e2ce
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
Log Message:
-----------
FIX The project was lost when creating the event "sent by email". Also,
event company "create" was not tracked by default like others.
Commit: d71754f577878cc24e28ecadd400939e8cc75ccb
https://github.com/Dolibarr/dolibarr/commit/d71754f577878cc24e28ecadd400939e8cc75ccb
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: 42be661b1d60b177b8322c4d79f2026c3bc93767
https://github.com/Dolibarr/dolibarr/commit/42be661b1d60b177b8322c4d79f2026c3bc93767
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
Fix bad error message output
Commit: 441a8c4a74462643243c4dea038ce062d7de427c
https://github.com/Dolibarr/dolibarr/commit/441a8c4a74462643243c4dea038ce062d7de427c
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
FIX Can make a movement on "out of sell" products
Commit: 2d037eb34eb427f9af13d07a6dbf334f480c7ab0
https://github.com/Dolibarr/dolibarr/commit/2d037eb34eb427f9af13d07a6dbf334f480c7ab0
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
FIX Direction of movement lost if an error occurs
Commit: 80354cd8d624491a202603a9cf41861f4502b8d4
https://github.com/Dolibarr/dolibarr/commit/80354cd8d624491a202603a9cf41861f4502b8d4
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/product/stock/mouvement.php
Log Message:
-----------
FIX Can correct stock of lot using eatby or sell by date
Commit: 3a08a14d56f620bc23389e47ac90f52fcc94bf42
https://github.com/Dolibarr/dolibarr/commit/3a08a14d56f620bc23389e47ac90f52fcc94bf42
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Commit: 80d99651a45414caa387ae281d42ec8eea06303e
https://github.com/Dolibarr/dolibarr/commit/80d99651a45414caa387ae281d42ec8eea06303e
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
htdocs/product/stock/tpl/stockcorrection.tpl.php
Commit: f90946dbde3bc277dbf9f8efd071867c842bf98e
https://github.com/Dolibarr/dolibarr/commit/f90946dbde3bc277dbf9f8efd071867c842bf98e
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
Log Message:
-----------
Fix test on eat and sell date
Commit: af095287384afb81f3845b8d242e6f2d7899b48b
https://github.com/Dolibarr/dolibarr/commit/af095287384afb81f3845b8d242e6f2d7899b48b
Author: Laurent Destailleur <address@hidden>
Date: 2016-07-21 (Thu, 21 Jul 2016)
Changed paths:
M ChangeLog
M build/debian/dolibarr.docs
M build/debian/watch
M build/doxygen/doxygen_footer.html
M build/doxygen/doxygen_header.html
M build/makepack-dolibarr.pl
M dev/translation/sanity_check_en_langfiles.php
M htdocs/adherents/list.php
M htdocs/comm/propal/card.php
M htdocs/comm/remx.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/don/class/don.class.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/install/mysql/data/llx_c_tva.sql
M htdocs/install/mysql/tables/llx_product.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/boxes.lang
M htdocs/langs/en_US/companies.lang
M htdocs/product/index.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/projet/card.php
M htdocs/projet/element.php
M htdocs/societe/notify/card.php
M htdocs/societe/soc.php
Log Message:
-----------
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
__AMOUNT_WO_TAX__ into emails templates.
Compare:
https://github.com/Dolibarr/dolibarr/compare/5749c1889d81...af095287384a