[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 337643: Accountancy : Correct errors
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 337643: Accountancy : Correct errors of display in bank jo... |
|
Date: |
Sun, 06 Dec 2015 10:52:05 -0800 |
Branch: refs/heads/3.7_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 337643e53e29b9862b92c6d73ce7a27975e79d02
https://github.com/Dolibarr/dolibarr/commit/337643e53e29b9862b92c6d73ce7a27975e79d02
Author: aspangaro <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Accountancy : Correct errors of display in bank journal
Commit: 06f752b250ff084f3d9bf9256cebf30f0d77c0d6
https://github.com/Dolibarr/dolibarr/commit/06f752b250ff084f3d9bf9256cebf30f0d77c0d6
Author: aspangaro <address@hidden>
Date: 2015-11-16 (Mon, 16 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/list.php
M htdocs/comm/action/card.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/card.php
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/card.php
M htdocs/product/stock/product.php
M htdocs/societe/rib.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
Commit: 85a58f666ae01939c5a62c77ac67451d59f24b3a
https://github.com/Dolibarr/dolibarr/commit/85a58f666ae01939c5a62c77ac67451d59f24b3a
Author: arnaud <address@hidden>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
FIX product link in project box
Commit: f615927d241a6e004a364afcf3a686f46eb8766e
https://github.com/Dolibarr/dolibarr/commit/f615927d241a6e004a364afcf3a686f46eb8766e
Author: fmarcet <address@hidden>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
FIX Not use localtaxes when invoice some orders
Commit: 6c379029fa6351d9e016d161ea78d5ea5a20f86c
https://github.com/Dolibarr/dolibarr/commit/6c379029fa6351d9e016d161ea78d5ea5a20f86c
Author: Juanjo Menent <address@hidden>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
Merge pull request #4033 from atm-arnaud/3.7_fix_project_box
FIX product link in project box
Commit: a627e32fca7b380296c3acce3603485581b19869
https://github.com/Dolibarr/dolibarr/commit/a627e32fca7b380296c3acce3603485581b19869
Author: Juanjo Menent <address@hidden>
Date: 2015-11-18 (Wed, 18 Nov 2015)
Changed paths:
M htdocs/commande/orderstoinvoice.php
Log Message:
-----------
Merge pull request #4034 from fmarcet/3.7
FIX Not use localtaxes when invoice some orders
Commit: 4233d24f4bc22daf0e15caa8ab4fa023f4e2973d
https://github.com/Dolibarr/dolibarr/commit/4233d24f4bc22daf0e15caa8ab4fa023f4e2973d
Author: arnaud <address@hidden>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
FIX export with category contact extrafields
Commit: 07226d32ec23bd9da39bc11c67ef0fd380b007dd
https://github.com/Dolibarr/dolibarr/commit/07226d32ec23bd9da39bc11c67ef0fd380b007dd
Author: arnaud <address@hidden>
Date: 2015-11-20 (Fri, 20 Nov 2015)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
FIX NB task and percent progress in box project
Commit: 07d24a9a05efc400502f322531283c360a5e40e5
https://github.com/Dolibarr/dolibarr/commit/07d24a9a05efc400502f322531283c360a5e40e5
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/boxes/box_project.php
Log Message:
-----------
Merge pull request #4044 from atm-arnaud/3.7_fix_project_box_nb_task
FIX Nb of tasks and percent progress in box project
Commit: c77eaeaa7778774774eaa6faf852d0a4953722d6
https://github.com/Dolibarr/dolibarr/commit/c77eaeaa7778774774eaa6faf852d0a4953722d6
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge pull request #4040 from atm-arnaud/3.6_fix_export_category_contact
FIX export with category contact extrafields
Commit: 9f27e2323f33e42e27fb55ddaf7dfffced77f87a
https://github.com/Dolibarr/dolibarr/commit/9f27e2323f33e42e27fb55ddaf7dfffced77f87a
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
FIX #3734 Do not show empty links of deleted source objects in stock movement
list
Commit: c04743aa84c3fd08733dff2cd0af5a781c0eb490
https://github.com/Dolibarr/dolibarr/commit/c04743aa84c3fd08733dff2cd0af5a781c0eb490
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Commit: d64664f5a78281469de67ffd95b0434dc0d7028a
https://github.com/Dolibarr/dolibarr/commit/d64664f5a78281469de67ffd95b0434dc0d7028a
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-21 (Sat, 21 Nov 2015)
Changed paths:
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Merge pull request #4057 from marcosgdf/bug-3734
FIX #3734 Do not show empty links of deleted source objects in stock movement
list
Commit: 91ce70a6e98035e8796f2953974a9ba3fe9a17f5
https://github.com/Dolibarr/dolibarr/commit/91ce70a6e98035e8796f2953974a9ba3fe9a17f5
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-23 (Mon, 23 Nov 2015)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
FIX #4081 Added missing translation
Commit: 973e42d10f5a70fc26f1e133f8006160c9de8169
https://github.com/Dolibarr/dolibarr/commit/973e42d10f5a70fc26f1e133f8006160c9de8169
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/core/lib/date.lib.php
Log Message:
-----------
FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
Commit: 8c0dffd24e2be2552bc8deb631832efb25e787ab
https://github.com/Dolibarr/dolibarr/commit/8c0dffd24e2be2552bc8deb631832efb25e787ab
Author: aspangaro <address@hidden>
Date: 2015-11-25 (Wed, 25 Nov 2015)
Changed paths:
M htdocs/commande/orderstoinvoice.php
M htdocs/core/boxes/box_project.php
M htdocs/core/modules/modCategorie.class.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
Commit: 041fa8d3f38d54be4702b2e6922c3a11bb94e341
https://github.com/Dolibarr/dolibarr/commit/041fa8d3f38d54be4702b2e6922c3a11bb94e341
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/langs/en_US/users.lang
Log Message:
-----------
Merge pull request #4083 from GPCsolutions/3.6-4081
FIX #4081 Added missing translation
Commit: 9a2259c6811e76cc0771a52c18980ddefeba0c1f
https://github.com/Dolibarr/dolibarr/commit/9a2259c6811e76cc0771a52c18980ddefeba0c1f
Author: aspangaro <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/core/lib/report.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Correct button 'Export' and 'Write bookkeeping' on finance journal
Commit: 37da315af64a8c41ef76d4db66da6a2515e373dc
https://github.com/Dolibarr/dolibarr/commit/37da315af64a8c41ef76d4db66da6a2515e373dc
Author: aspangaro <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Remove old code
Commit: 208bf2545fd1519c639097db6241f793a78a9adf
https://github.com/Dolibarr/dolibarr/commit/208bf2545fd1519c639097db6241f793a78a9adf
Author: fmarcet <address@hidden>
Date: 2015-11-26 (Thu, 26 Nov 2015)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany
Commit: 2ce00b2956dcd9830c3b1e4ca3bdae6358ec82fe
https://github.com/Dolibarr/dolibarr/commit/2ce00b2956dcd9830c3b1e4ca3bdae6358ec82fe
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M htdocs/core/lib/date.lib.php
Log Message:
-----------
Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
Commit: ae87a270e4414eef36e580b8df0572e14855b323
https://github.com/Dolibarr/dolibarr/commit/ae87a270e4414eef36e580b8df0572e14855b323
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
M htdocs/core/lib/report.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #4101 from aspangaro/3.7-accountancy
Fix #4069 Accountancy - button "export" don't work on finance journal
Commit: e72f4cb063533a85be39860d2341bb6942e7b60d
https://github.com/Dolibarr/dolibarr/commit/e72f4cb063533a85be39860d2341bb6942e7b60d
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-28 (Sat, 28 Nov 2015)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #4102 from fmarcet/3.6
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
Commit: b1122b55d464a170c0c846c20b91d1ad67e93be6
https://github.com/Dolibarr/dolibarr/commit/b1122b55d464a170c0c846c20b91d1ad67e93be6
Author: aspangaro <address@hidden>
Date: 2015-11-30 (Mon, 30 Nov 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix : accountancy code on finance journal is not a constant
Commit: bd632cf2b0205c4e7a5c08c631a088ae31986378
https://github.com/Dolibarr/dolibarr/commit/bd632cf2b0205c4e7a5c08c631a088ae31986378
Author: Florian HENRY <address@hidden>
Date: 2015-12-02 (Wed, 02 Dec 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX : Use "WHERE true" instead of "WHERE 1" #4132
Commit: a7020506aa76b9a88ebf7d7ced63cf60c0c3809c
https://github.com/Dolibarr/dolibarr/commit/a7020506aa76b9a88ebf7d7ced63cf60c0c3809c
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Merge pull request #4123 from aspangaro/3.7-accountancy
Fix : accountancy code on finance journal is not a constant
Commit: 1694481df88c3aad6c8e839c4b64f32aca873598
https://github.com/Dolibarr/dolibarr/commit/1694481df88c3aad6c8e839c4b64f32aca873598
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #4134 from FHenry/3.7
FIX : Use "WHERE true" instead of "WHERE 1" #4132
Commit: 7105fabb799123a9f2aa144a92f02419adad7ca6
https://github.com/Dolibarr/dolibarr/commit/7105fabb799123a9f2aa144a92f02419adad7ca6
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-03 (Thu, 03 Dec 2015)
Changed paths:
M htdocs/core/lib/date.lib.php
M htdocs/langs/en_US/users.lang
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
Commit: d2b221cfd1ebb60a0d53b8b74b27b9cc9a730550
https://github.com/Dolibarr/dolibarr/commit/d2b221cfd1ebb60a0d53b8b74b27b9cc9a730550
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Upgrade PHPCS rules
Commit: 00aa5aace7a5a236701a7c91491689a527a1f399
https://github.com/Dolibarr/dolibarr/commit/00aa5aace7a5a236701a7c91491689a527a1f399
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-04 (Fri, 04 Dec 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
dev/codesniffer/ruleset.xml
Commit: a209d1864984e26b39cbfd13f2634d513ef466ec
https://github.com/Dolibarr/dolibarr/commit/a209d1864984e26b39cbfd13f2634d513ef466ec
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M htdocs/compta/deplacement/card.php
Log Message:
-----------
FIX Can use formated float number on old expense report module.
Commit: 320563eea98f8d2d6d4dee00c695ab5297e6a152
https://github.com/Dolibarr/dolibarr/commit/320563eea98f8d2d6d4dee00c695ab5297e6a152
Author: Laurent Destailleur <address@hidden>
Date: 2015-12-06 (Sun, 06 Dec 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
M htdocs/accountancy/journal/bankjournal.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/deplacement/card.php
M htdocs/core/boxes/box_project.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/date.lib.php
M htdocs/core/lib/report.lib.php
M htdocs/core/modules/modCategorie.class.php
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/users.lang
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.7_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/599e796aae0f...320563eea98f