[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b47252: Modifiy menu for accountancy
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b47252: Modifiy menu for accountancy module - New balance ... |
|
Date: |
Thu, 18 Feb 2016 19:46:24 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b47252fcb6a206d3c73eec4127f05007dac71b76
https://github.com/Dolibarr/dolibarr/commit/b47252fcb6a206d3c73eec4127f05007dac71b76
Author: aspangaro <address@hidden>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Modifiy menu for accountancy module - New balance feature
Commit: 87fee74fb12a8f6db1ab3759b76a100ddc9558d4
https://github.com/Dolibarr/dolibarr/commit/87fee74fb12a8f6db1ab3759b76a100ddc9558d4
Author: aspangaro <address@hidden>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Modify menu for accountancy module - New balance feature
Commit: f1a26cf54b3c88bde2738edc0d22ed649af5c101
https://github.com/Dolibarr/dolibarr/commit/f1a26cf54b3c88bde2738edc0d22ed649af5c101
Author: aspangaro <address@hidden>
Date: 2016-02-11 (Thu, 11 Feb 2016)
Changed paths:
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Correct problem of merging for language file
Commit: a8ead1d44ce4c4d88366e5d4e8a28e44dc8ba793
https://github.com/Dolibarr/dolibarr/commit/a8ead1d44ce4c4d88366e5d4e8a28e44dc8ba793
Author: aspangaro <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
A htdocs/accountancy/bookkeeping/balance.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/journal/purchasesjournal.php
M htdocs/adherents/list.php
M htdocs/admin/confexped.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/oauth.php
M htdocs/comm/mailing/card.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/remise.php
M htdocs/compta/facture.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modOauth.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/oauth/google_oauthcallback.php
M htdocs/core/modules/printing/printgcp.modules.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/exports/class/export.class.php
M htdocs/imports/class/import.class.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
M htdocs/societe/price.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11
Correct conflicts:
htdocs/core/menus/standard/eldy.lib.php
Commit: d4057c3febe9e1254adfa65263585bd39cd86bea
https://github.com/Dolibarr/dolibarr/commit/d4057c3febe9e1254adfa65263585bd39cd86bea
Author: aspangaro <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/compta/charges/index.php
Log Message:
-----------
Fixed: Correct problem of rights beetween tax and salaries module
Commit: 353fa7c2fc445234c906cf4ae43074f612b3291f
https://github.com/Dolibarr/dolibarr/commit/353fa7c2fc445234c906cf4ae43074f612b3291f
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/admin/workflow.php
Log Message:
-----------
Little cleaning on how options ar shown
Commit: be77887477f606f2256fe0943c9a96466ea3520f
https://github.com/Dolibarr/dolibarr/commit/be77887477f606f2256fe0943c9a96466ea3520f
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/compta/charges/index.php
Log Message:
-----------
Merge pull request #4628 from aspangaro/3.8-p2
Fixed: Correct problem of rights beetween tax and salaries module
Commit: 816195cb438cd70bb44d0651ed5b7eccae4c5b88
https://github.com/Dolibarr/dolibarr/commit/816195cb438cd70bb44d0651ed5b7eccae4c5b88
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-15 (Mon, 15 Feb 2016)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/en_US/accountancy.lang
Log Message:
-----------
Merge pull request #4600 from aspangaro/3.9-p11
Modifiy menu for accountancy module - New balance feature
Commit: d55ac472c3d2ca1cfc85c43f9dafcf2c081d0cad
https://github.com/Dolibarr/dolibarr/commit/d55ac472c3d2ca1cfc85c43f9dafcf2c081d0cad
Author: Regis Houssin <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/core/modules/rapport/pdf_paiement.class.php
Log Message:
-----------
Fix: issue when bank module is disabled
Fix: missing entity filter for lines of payment
Commit: 134c9d13bc521bd62a29c651fbce927097168c24
https://github.com/Dolibarr/dolibarr/commit/134c9d13bc521bd62a29c651fbce927097168c24
Author: jfefe <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/categories/index.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
FIX : check contrast of link when using background color for category
Commit: 841145678d13a24ac0f3e01aa4375109948f5b0c
https://github.com/Dolibarr/dolibarr/commit/841145678d13a24ac0f3e01aa4375109948f5b0c
Author: jfefe <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/categories/index.php
Log Message:
-----------
Always check links color when background color is set onto category
Commit: 18ab1ab63ad5e032e9b3c5fbb8d60502e80a414f
https://github.com/Dolibarr/dolibarr/commit/18ab1ab63ad5e032e9b3c5fbb8d60502e80a414f
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/core/modules/rapport/pdf_paiement.class.php
Log Message:
-----------
Merge pull request #4634 from hregis/3.8_bug
Fix: issue when bank module is disabled
Commit: 6c7fc5598851cf0349f3938d75c91cf5d6ad374a
https://github.com/Dolibarr/dolibarr/commit/6c7fc5598851cf0349f3938d75c91cf5d6ad374a
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge pull request #4636 from aternatik/label_cat
FIX : check contrast of link when using background color for category
Commit: d8e173af032827ae070f00dc5452ca78032dfe64
https://github.com/Dolibarr/dolibarr/commit/d8e173af032827ae070f00dc5452ca78032dfe64
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix regression (class not found, css on hover broken) with try to manage
contrast on categories.
Commit: 14fb2c914aa93123f95a624571b6c4de2dc5d266
https://github.com/Dolibarr/dolibarr/commit/14fb2c914aa93123f95a624571b6c4de2dc5d266
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/core/tpl/objectline_view.tpl.php
Log Message:
-----------
Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output
Commit: 03b9b65d933b02ea796c609b8538e04abf5320da
https://github.com/Dolibarr/dolibarr/commit/03b9b65d933b02ea796c609b8538e04abf5320da
Author: philippe grand <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
[quality] : better help
Commit: 633de3bcb454908cdbe9ee2bdd62d16cbf2dffb2
https://github.com/Dolibarr/dolibarr/commit/633de3bcb454908cdbe9ee2bdd62d16cbf2dffb2
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths:
M htdocs/core/lib/product.lib.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/products.lang
M htdocs/product/stats/facture.php
Log Message:
-----------
Fix list of object referers should not be set to invoice by default (may
be module is disabed). I replace with a message to choose list.
Commit: 5d2c189e0e9b41ad4757d8dfbf047de5626c2b61
https://github.com/Dolibarr/dolibarr/commit/5d2c189e0e9b41ad4757d8dfbf047de5626c2b61
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Fix bad place of table
Commit: 1a12eb33d6a6f45e05f0aebf6119407fe894547c
https://github.com/Dolibarr/dolibarr/commit/1a12eb33d6a6f45e05f0aebf6119407fe894547c
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge pull request #4639 from grandoc/3.9
[quality] : better help
Commit: dfe7c6f06f1ef5d399c776297b3df939b666e0eb
https://github.com/Dolibarr/dolibarr/commit/dfe7c6f06f1ef5d399c776297b3df939b666e0eb
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Fix #4649 Wrong parameters order
Commit: 9fd22722ffccd8678ea09042f003e1d9d887f358
https://github.com/Dolibarr/dolibarr/commit/9fd22722ffccd8678ea09042f003e1d9d887f358
Author: BENKE Charlie <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/contact/card.php
Log Message:
-----------
left a space between clone and $object
Commit: b269e997c15c39082e155ef7cddc63a9fda8d8a8
https://github.com/Dolibarr/dolibarr/commit/b269e997c15c39082e155ef7cddc63a9fda8d8a8
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #4650 from GPCsolutions/3.8-4649
Fix #4649 Wrong parameters order
Commit: 0c11d9e7947e67f72da09024a06c72ec6130ea18
https://github.com/Dolibarr/dolibarr/commit/0c11d9e7947e67f72da09024a06c72ec6130ea18
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/contact/card.php
Log Message:
-----------
Merge pull request #4651 from defrance/patch-102
Left a space between clone and $object
Commit: bc4c964b891af67f41492a9e0c0f0a37362716eb
https://github.com/Dolibarr/dolibarr/commit/bc4c964b891af67f41492a9e0c0f0a37362716eb
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/langs/en_US/stocks.lang
M htdocs/product/stock/massstockmove.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
Log Message:
-----------
Several fixes in stock management (label, and bad action when lot module
is on)
Commit: b0b26684286384e5700dbba25669ef897035343e
https://github.com/Dolibarr/dolibarr/commit/b0b26684286384e5700dbba25669ef897035343e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/contact/card.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/product.lib.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/products.lang
M htdocs/product/stats/facture.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: 52c82508e4c95561f7c2f45f16f206f7da4f8b26
https://github.com/Dolibarr/dolibarr/commit/52c82508e4c95561f7c2f45f16f206f7da4f8b26
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-18 (Thu, 18 Feb 2016)
Changed paths:
M htdocs/compta/charges/index.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/product/price.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/compta/charges/index.php
Commit: bd80249580e2dbdd85e43c087cd83edaca915241
https://github.com/Dolibarr/dolibarr/commit/bd80249580e2dbdd85e43c087cd83edaca915241
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Fix code comment
Commit: 3b5ce32cb058f22a5ee099e633aba0b90b74f17e
https://github.com/Dolibarr/dolibarr/commit/3b5ce32cb058f22a5ee099e633aba0b90b74f17e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Code comment
Commit: 4d0b9946f5941e81fa99a99346bfb25988ecfe3c
https://github.com/Dolibarr/dolibarr/commit/4d0b9946f5941e81fa99a99346bfb25988ecfe3c
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/install/mysql/tables/llx_product.sql
M htdocs/install/mysql/tables/llx_product_customer_price.sql
M htdocs/install/mysql/tables/llx_product_customer_price_log.sql
M htdocs/install/mysql/tables/llx_product_price.sql
M htdocs/product/class/product.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
Log Message:
-----------
FIX Maxi serious problem when updating prices and vat of a product. All
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
Commit: 16c44af690211fffb04a4205784a51d9cbb90689
https://github.com/Dolibarr/dolibarr/commit/16c44af690211fffb04a4205784a51d9cbb90689
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix bad example of setup to use
Commit: 9e11fd988dd720906c3c6b5b2effe2b8a447e3cc
https://github.com/Dolibarr/dolibarr/commit/9e11fd988dd720906c3c6b5b2effe2b8a447e3cc
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/categories/viewcat.php
Log Message:
-----------
Fix: color of category when showing full path must use color of last
element of path
Commit: b70f2f329c65e92e5b0e6fa2421d5f6aa138f54e
https://github.com/Dolibarr/dolibarr/commit/b70f2f329c65e92e5b0e6fa2421d5f6aa138f54e
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/comm/multiprix.php
Log Message:
-----------
Fix bad position of form
Commit: 3864bd35c9258cec647873d536db7c8788a7a77d
https://github.com/Dolibarr/dolibarr/commit/3864bd35c9258cec647873d536db7c8788a7a77d
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/product/price.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
Log Message:
-----------
Fix NPR Vat is working correctly with multiprice too
Commit: 79bc7cf08531b7a572dcc9ea7231184c2aa4b248
https://github.com/Dolibarr/dolibarr/commit/79bc7cf08531b7a572dcc9ea7231184c2aa4b248
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/admin/company.php
Log Message:
-----------
Fix showing description
Commit: cc524c818095d3e78fe85868f8bb6134c7a75cd6
https://github.com/Dolibarr/dolibarr/commit/cc524c818095d3e78fe85868f8bb6134c7a75cd6
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Fix bad picto
Commit: 9c8d69eaa9578e672b6a6542410528002a09ddb6
https://github.com/Dolibarr/dolibarr/commit/9c8d69eaa9578e672b6a6542410528002a09ddb6
Author: Laurent Destailleur <address@hidden>
Date: 2016-02-19 (Fri, 19 Feb 2016)
Changed paths:
M htdocs/admin/company.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/viewcat.php
M htdocs/comm/multiprix.php
M htdocs/compta/charges/index.php
M htdocs/contact/card.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/price.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
M htdocs/install/mysql/tables/llx_product.sql
M htdocs/install/mysql/tables/llx_product_customer_price.sql
M htdocs/install/mysql/tables/llx_product_customer_price_log.sql
M htdocs/install/mysql/tables/llx_product_price.sql
M htdocs/langs/en_US/accountancy.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/stocks.lang
M htdocs/product/class/product.class.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
M htdocs/product/stats/facture.php
M htdocs/product/stock/massstockmove.php
M htdocs/product/stock/mouvement.php
M htdocs/product/stock/product.php
M htdocs/product/stock/replenish.php
M htdocs/product/stock/replenishorders.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/761ad0114cb1...9c8d69eaa957