[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] d4ee18: FIX : 3880
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] d4ee18: FIX : 3880 |
|
Date: |
Fri, 13 Nov 2015 03:35:31 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: d4ee1836629331109721bcd3f8eba1917a2d7fe0
https://github.com/Dolibarr/dolibarr/commit/d4ee1836629331109721bcd3f8eba1917a2d7fe0
Author: Florian HENRY <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX : 3880
Commit: c0136daeb5263f33ab0b258b55771886d36005fd
https://github.com/Dolibarr/dolibarr/commit/c0136daeb5263f33ab0b258b55771886d36005fd
Author: Florian HENRY <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.8.0.sql
M htdocs/core/lib/admin.lib.php
M htdocs/core/modules/DolibarrModules.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 876ab4bb592204a9dc112f88abee1e0fd9928de1
https://github.com/Dolibarr/dolibarr/commit/876ab4bb592204a9dc112f88abee1e0fd9928de1
Author: Florian HENRY <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX : #3882
Commit: c534f5bcd51485747c808c76128b22b60e7cc9f8
https://github.com/Dolibarr/dolibarr/commit/c534f5bcd51485747c808c76128b22b60e7cc9f8
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-11-04 (Wed, 04 Nov 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix #3805 Enhanced Facture::is_last_in_cycle()
Commit: 4bb21fd2185f6bd86b43f964aa2e596d34d5129c
https://github.com/Dolibarr/dolibarr/commit/4bb21fd2185f6bd86b43f964aa2e596d34d5129c
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Merge pull request #3884 from FHenry/3.8
FIX #3880
Commit: 14ec86047f08e3c5240f31bcce07ef70deb24afe
https://github.com/Dolibarr/dolibarr/commit/14ec86047f08e3c5240f31bcce07ef70deb24afe
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #3886 from GPCsolutions/dolibarr-3805
Fix #3805 Enhanced Facture::is_last_in_cycle()
Commit: f319976e5df84c248123ff6ef3bba9896005a11b
https://github.com/Dolibarr/dolibarr/commit/f319976e5df84c248123ff6ef3bba9896005a11b
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX #3878 Storing and deleting files on emailing was done at wrong place
Conflicts:
htdocs/comm/mailing/card.php
Commit: 015dedc3abcc27dc9f271d23ff68e19200d9f8b1
https://github.com/Dolibarr/dolibarr/commit/015dedc3abcc27dc9f271d23ff68e19200d9f8b1
Author: fmarcet <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
Log Message:
-----------
FIX: Show category selector if we have permission to view products or
services
Commit: 63d447d1a72b23caa7f854e545ba9ca102ca3e59
https://github.com/Dolibarr/dolibarr/commit/63d447d1a72b23caa7f854e545ba9ca102ca3e59
Author: Juanjo Menent <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #3893 from fmarcet/3.8
FIX: Not showing category selector
Commit: 58cac2d89588818e45371c1263aa052a11d1676b
https://github.com/Dolibarr/dolibarr/commit/58cac2d89588818e45371c1263aa052a11d1676b
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-05 (Thu, 05 Nov 2015)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/stock/product.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/comm/action/card.php
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/product.php
Commit: e78ebf041a78f8b228392eb8bf4ec074ed4c7192
https://github.com/Dolibarr/dolibarr/commit/e78ebf041a78f8b228392eb8bf4ec074ed4c7192
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
Log Message:
-----------
Fix deprecated code not working in jcrop. $.browser.msie and $.browser
is no more available in jquery 1.9+.
Commit: 8d829dca320ca0a9c864a9052447a8d55043d483
https://github.com/Dolibarr/dolibarr/commit/8d829dca320ca0a9c864a9052447a8d55043d483
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
FIX : only active customer should be return into new invoice creation
select list
Commit: 600dbced7e859cf5331b8a11bd58dfd1deac7da5
https://github.com/Dolibarr/dolibarr/commit/600dbced7e859cf5331b8a11bd58dfd1deac7da5
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/stock/product.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: 4d11205a01f056dd1a0dd2baf1223e35ef953d60
https://github.com/Dolibarr/dolibarr/commit/4d11205a01f056dd1a0dd2baf1223e35ef953d60
Author: Christophe Battarel <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
FIX: change object statut on close shipping and remove erratic db commit
Commit: 87a102f5c8069d6a82eb2e714c163c2269ba1733
https://github.com/Dolibarr/dolibarr/commit/87a102f5c8069d6a82eb2e714c163c2269ba1733
Author: Juanjo Menent <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #3910 from FHenry/3.7
FIX : only active customer should be available into select list thirdparty on
invoice creation
Commit: f33157033c26f4d85b23ee0f718b069f74b74bd2
https://github.com/Dolibarr/dolibarr/commit/f33157033c26f4d85b23ee0f718b069f74b74bd2
Author: Juanjo Menent <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
Commit: 126b5d6ecae5b74f5395638f8de109c7cab62a4f
https://github.com/Dolibarr/dolibarr/commit/126b5d6ecae5b74f5395638f8de109c7cab62a4f
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
FIX : only active customer should be available into select list
thirdparty on invoice creation
Commit: f220f584ceac514648368c4ee017e791be69cc55
https://github.com/Dolibarr/dolibarr/commit/f220f584ceac514648368c4ee017e791be69cc55
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/expedition/class/expedition.class.php
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/product/stock/product.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 121d2beb8067fd224d440c90d646f9371fb4398d
https://github.com/Dolibarr/dolibarr/commit/121d2beb8067fd224d440c90d646f9371fb4398d
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
fix spacing
Commit: f6b8c3a13030fad347b4dc52df9e0ffa7d59056a
https://github.com/Dolibarr/dolibarr/commit/f6b8c3a13030fad347b4dc52df9e0ffa7d59056a
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
FIX : #3912
Commit: b0be2b04c7bee60c2f65eb6fde3f2c511ba81d80
https://github.com/Dolibarr/dolibarr/commit/b0be2b04c7bee60c2f65eb6fde3f2c511ba81d80
Author: Florian HENRY <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
FIX : #3912
Commit: 3d04de201e4f593e27fdbe81419f3012d581640f
https://github.com/Dolibarr/dolibarr/commit/3d04de201e4f593e27fdbe81419f3012d581640f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-06 (Fri, 06 Nov 2015)
Changed paths:
M htdocs/compta/facture.php
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Merge pull request #3911 from FHenry/3.8
FIX : only active customer should be available into select list thirdparty on
invoice creation
Commit: b4c3804c911d458d575ab0ce559e2acbf521ae6b
https://github.com/Dolibarr/dolibarr/commit/b4c3804c911d458d575ab0ce559e2acbf521ae6b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
FIX #3928 Creating a Customer order and a Customer invoice from a project,
does not inherit payment conditions and method of payment of customer card
Commit: 3bbedf1795c8b93527954af5fc814034b9b94800
https://github.com/Dolibarr/dolibarr/commit/3bbedf1795c8b93527954af5fc814034b9b94800
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/societe/rib.php
Log Message:
-----------
FIX #3707 Thirdparty bank account page table has a glitch
Commit: 728f469c1e37e9cec1f22686461f8eedf48e8d12
https://github.com/Dolibarr/dolibarr/commit/728f469c1e37e9cec1f22686461f8eedf48e8d12
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/compta/bank/treso.php
Log Message:
-----------
FIX #3890 Expected transactions bank account page, shows negative numbers
Commit: 01854b32597022f0a7c595154809a9b2ba0e6930
https://github.com/Dolibarr/dolibarr/commit/01854b32597022f0a7c595154809a9b2ba0e6930
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/compta/localtax/card.php
Log Message:
-----------
FIX #3679 Error when deleting a Localtax2 special payment
Commit: 84a152dc2ec2c84350a7214071422ed9b3251712
https://github.com/Dolibarr/dolibarr/commit/84a152dc2ec2c84350a7214071422ed9b3251712
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
Log Message:
-----------
FIX #3836 Unable to upload a document to an invoice under some circunstances
Commit: 4a52d3c1b1a2ca4df694e222df71b6591676e5c1
https://github.com/Dolibarr/dolibarr/commit/4a52d3c1b1a2ca4df694e222df71b6591676e5c1
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
Removed unwanted change
Commit: a4fafae1096ec577ebb8e8246bad5a88c05664c5
https://github.com/Dolibarr/dolibarr/commit/a4fafae1096ec577ebb8e8246bad5a88c05664c5
Author: Florian HENRY <address@hidden>
Date: 2015-11-07 (Sat, 07 Nov 2015)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
FIX : Remove column creation for table llx_product_fournisseur_price,
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
Commit: f0a3bca4c205b00d36336063b59ba389480494fe
https://github.com/Dolibarr/dolibarr/commit/f0a3bca4c205b00d36336063b59ba389480494fe
Author: aspangaro <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
Fix: Accountancy compatibility with subtotal & jalon module
Commit: d69e76168f2e464e831126e5448b3020d1acad04
https://github.com/Dolibarr/dolibarr/commit/d69e76168f2e464e831126e5448b3020d1acad04
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #3929 from marcosgdf/bug-3928
FIX #3928 Creating a Customer order and a Customer invoice from a project, does
not inherit payment conditions and method of payment of customer card
Commit: 0cab08b2f39d35bfd35824ad48dfb3f9983b40e2
https://github.com/Dolibarr/dolibarr/commit/0cab08b2f39d35bfd35824ad48dfb3f9983b40e2
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/societe/rib.php
Log Message:
-----------
Merge pull request #3932 from marcosgdf/bug-3707
FIX #3707 Thirdparty bank account page table has a glitch
Commit: a6f0baefc108a5a5ec9532750f9abe46897999ba
https://github.com/Dolibarr/dolibarr/commit/a6f0baefc108a5a5ec9532750f9abe46897999ba
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/compta/bank/treso.php
Log Message:
-----------
Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
Commit: 8377d6967ac2cf6878a463c4db3fb2897851a959
https://github.com/Dolibarr/dolibarr/commit/8377d6967ac2cf6878a463c4db3fb2897851a959
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/compta/localtax/card.php
Log Message:
-----------
Merge pull request #3934 from marcosgdf/bug-3679
FIX #3679 Error when deleting a Localtax2 special payment
Commit: 7673a73a65379f14d862f2bde0921ca68eedb10b
https://github.com/Dolibarr/dolibarr/commit/7673a73a65379f14d862f2bde0921ca68eedb10b
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/core/lib/files.lib.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
Log Message:
-----------
Merge pull request #3939 from marcosgdf/bug-3836
FIX #3836 Unable to upload a document to an invoice under some circunstances
Commit: 57f0d0b3271e2d6664e8788b42f3b3f6c87c661a
https://github.com/Dolibarr/dolibarr/commit/57f0d0b3271e2d6664e8788b42f3b3f6c87c661a
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Merge pull request #3944 from FHenry/3.8
FIX : Remove column creation for table llx_product_fournisseur_price,
Commit: 0ce7cad48c76373a7fe82574ccb587ac923ac583
https://github.com/Dolibarr/dolibarr/commit/0ce7cad48c76373a7fe82574ccb587ac923ac583
Author: Juanjo Menent <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/card.php
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
Merge pull request #3946 from aspangaro/3.7-1
Fix: Accountancy compatibility with subtotal & jalon module
Commit: 972c364c37f1011b454ae82866cc4d695edb780f
https://github.com/Dolibarr/dolibarr/commit/972c364c37f1011b454ae82866cc4d695edb780f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
Log Message:
-----------
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.8.2
Commit: 4a96fc5f62909f0b4bf03602bc9fdd81d9eb91c0
https://github.com/Dolibarr/dolibarr/commit/4a96fc5f62909f0b4bf03602bc9fdd81d9eb91c0
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/compta/facture.php
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 6b98c50510009d35f6a025c07d3d4defa72d8bd3
https://github.com/Dolibarr/dolibarr/commit/6b98c50510009d35f6a025c07d3d4defa72d8bd3
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
FIX Add a protection to not make release if ChangeLog was not generated.
Commit: 42ae4e10b3439cb879eac71a4845e790bf704bfa
https://github.com/Dolibarr/dolibarr/commit/42ae4e10b3439cb879eac71a4845e790bf704bfa
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Abandon package APS. Was never used.
Commit: 98b887edaee094b6ebff2fa90fbd8f35d90b982f
https://github.com/Dolibarr/dolibarr/commit/98b887edaee094b6ebff2fa90fbd8f35d90b982f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
Log Message:
-----------
Update doc to generate ChangeLog
Commit: 7a0206adceb3760f867658bff3a0f78bbcdfb3db
https://github.com/Dolibarr/dolibarr/commit/7a0206adceb3760f867658bff3a0f78bbcdfb3db
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
Log Message:
-----------
FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
Commit: e6ab6bdb8e63b91058e489fae84551acd40819e4
https://github.com/Dolibarr/dolibarr/commit/e6ab6bdb8e63b91058e489fae84551acd40819e4
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
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/compta/facture.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/societe/rib.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: c639e820621cfe675cea540f443fc007f3972009
https://github.com/Dolibarr/dolibarr/commit/c639e820621cfe675cea540f443fc007f3972009
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
FIX Add a protection to not make release if ChangeLog was not generated.
Conflicts:
ChangeLog
Commit: 9b8bb114cd1850ceaf198ed840c40beeb1c0ba6e
https://github.com/Dolibarr/dolibarr/commit/9b8bb114cd1850ceaf198ed840c40beeb1c0ba6e
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
Log Message:
-----------
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2
Conflicts:
ChangeLog
Commit: 04aba8ce96807bf7856d263379fc911227e7660f
https://github.com/Dolibarr/dolibarr/commit/04aba8ce96807bf7856d263379fc911227e7660f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Abandon package APS. Was never used.
Commit: d4aeb8b3bcea0e212de82f2ade1070f56a262088
https://github.com/Dolibarr/dolibarr/commit/d4aeb8b3bcea0e212de82f2ade1070f56a262088
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/makepack-dolibarr.pl
Log Message:
-----------
Abandon package APS. Was never used.
Commit: 722a133b314807bd08b9a0d59c0614f6b0599d7f
https://github.com/Dolibarr/dolibarr/commit/722a133b314807bd08b9a0d59c0614f6b0599d7f
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
Log Message:
-----------
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Commit: 350345eccaa70ac932f7ddaa94e6f217f01bef6e
https://github.com/Dolibarr/dolibarr/commit/350345eccaa70ac932f7ddaa94e6f217f01bef6e
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M build/debian/changelog
Log Message:
-----------
Prepare 3.6.5
Commit: 71fa347e8e0a5f3bfbf7f76b0bbeb826d3a1b771
https://github.com/Dolibarr/dolibarr/commit/71fa347e8e0a5f3bfbf7f76b0bbeb826d3a1b771
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-08 (Sun, 08 Nov 2015)
Changed paths:
M htdocs/core/class/conf.class.php
Log Message:
-----------
FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
Commit: 98c32fa1ec8184dc84fd868210516f5a0dbd96c5
https://github.com/Dolibarr/dolibarr/commit/98c32fa1ec8184dc84fd868210516f5a0dbd96c5
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M htdocs/core/tpl/login.tpl.php
Log Message:
-----------
FIX The label hidden was not supported when using jmobile
Commit: b0419557b16e756eb2e4555b335b4c82da17efe9
https://github.com/Dolibarr/dolibarr/commit/b0419557b16e756eb2e4555b335b4c82da17efe9
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-10 (Tue, 10 Nov 2015)
Changed paths:
M htdocs/.gitignore
Log Message:
-----------
Exclude dir
Commit: f041c017e997602e98a0308eb86d178068645bcf
https://github.com/Dolibarr/dolibarr/commit/f041c017e997602e98a0308eb86d178068645bcf
Author: phf <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
FIX mail isn't display in title on event in mode view
Commit: aaa6f00d1186201729964ffca2b0dbcb109a4e46
https://github.com/Dolibarr/dolibarr/commit/aaa6f00d1186201729964ffca2b0dbcb109a4e46
Author: arnaud <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modPropale.class.php
Log Message:
-----------
FIX export propal and order with extrafields
Commit: 019575d9edf05b0a2e7672b6534f54845458832e
https://github.com/Dolibarr/dolibarr/commit/019575d9edf05b0a2e7672b6534f54845458832e
Author: Florian HENRY <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX : better fix for #3805
Commit: 52bd90f950c8b684a9af8d66325edbd39bb2773a
https://github.com/Dolibarr/dolibarr/commit/52bd90f950c8b684a9af8d66325edbd39bb2773a
Author: Regis Houssin <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Fix: wrong var name
Commit: 9a9be97c2cb5939b1687cb7867cc0c0a6081fefd
https://github.com/Dolibarr/dolibarr/commit/9a9be97c2cb5939b1687cb7867cc0c0a6081fefd
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Add a log to help diagnose bad usage of method ad of event
Commit: 8925717bbece1b83c8f93e6e63529834d8a8d7d7
https://github.com/Dolibarr/dolibarr/commit/8925717bbece1b83c8f93e6e63529834d8a8d7d7
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
Merge pull request #3966 from atm-ph/fix_38_title_actioncomm
FIX mail isn't display in title on event in mode view
Commit: 924db5b8aa774c71c4d80749462063886ed87103
https://github.com/Dolibarr/dolibarr/commit/924db5b8aa774c71c4d80749462063886ed87103
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #3969 from FHenry/3.8
FIX : better fix for #3805
Commit: 816bacc37e168d350aeb136fbf0635e333ab071d
https://github.com/Dolibarr/dolibarr/commit/816bacc37e168d350aeb136fbf0635e333ab071d
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modPropale.class.php
Log Message:
-----------
Merge pull request #3968 from
atm-arnaud/3.8_fix_export_extrafield_propal_order
FIX export propal and order with extrafields
Commit: f65829ec4242dc17d133d965e8b86201835a6c15
https://github.com/Dolibarr/dolibarr/commit/f65829ec4242dc17d133d965e8b86201835a6c15
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-12 (Thu, 12 Nov 2015)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Merge pull request #3970 from hregis/3.7_bug
Fix: wrong var name
Commit: b3be7f65cd1edd8fd99c652fa8bc53125f9c42d0
https://github.com/Dolibarr/dolibarr/commit/b3be7f65cd1edd8fd99c652fa8bc53125f9c42d0
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M htdocs/accountancy/customer/list.php
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
Fix syntax error . = instead of .=
Commit: c7546dbad2909be78e2351acdfa84ff6042fc547
https://github.com/Dolibarr/dolibarr/commit/c7546dbad2909be78e2351acdfa84ff6042fc547
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: eac80d7db4c5ba141b8e08176b77b3d384005230
https://github.com/Dolibarr/dolibarr/commit/eac80d7db4c5ba141b8e08176b77b3d384005230
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M ChangeLog
M htdocs/commande/card.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
Commit: bad28c6d921949da1ff7772a076d56999942e419
https://github.com/Dolibarr/dolibarr/commit/bad28c6d921949da1ff7772a076d56999942e419
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M htdocs/commande/card.php
Log Message:
-----------
Fi sntax error
Commit: 93be4305c44187fffcb6e245b1ea1691a2237abd
https://github.com/Dolibarr/dolibarr/commit/93be4305c44187fffcb6e245b1ea1691a2237abd
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M ChangeLog
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/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.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/triggers/interface_20_modWorkflow_WorkflowManager.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fichinter/card.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
Commit: ab177b43af92515d5f686bfabf566ea2102906de
https://github.com/Dolibarr/dolibarr/commit/ab177b43af92515d5f686bfabf566ea2102906de
Author: Laurent Destailleur <address@hidden>
Date: 2015-11-13 (Fri, 13 Nov 2015)
Changed paths:
M ChangeLog
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M htdocs/.gitignore
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/comm/action/class/actioncomm.class.php
M htdocs/comm/propal/list.php
M htdocs/commande/card.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/localtax/card.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/login.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/fourn/facture/card.php
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.js
M htdocs/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/682842f15fe3...ab177b43af92