[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 23e35a: update size of elementtype co
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 23e35a: update size of elementtype column into llx_actionc... |
|
Date: |
Thu, 10 Mar 2016 06:04:36 -0800 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: 23e35a6012363953e711b9adb02972f75094d48e
https://github.com/Dolibarr/dolibarr/commit/23e35a6012363953e711b9adb02972f75094d48e
Author: Florian HENRY <address@hidden>
Date: 2016-02-10 (Wed, 10 Feb 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
Log Message:
-----------
update size of elementtype column into llx_actioncomm (module_subelement
name can be longer than 32)
Commit: 49a33cb8f9a8fef7c81601347448626f0b5462d8
https://github.com/Dolibarr/dolibarr/commit/49a33cb8f9a8fef7c81601347448626f0b5462d8
Author: Florian HENRY <address@hidden>
Date: 2016-02-16 (Tue, 16 Feb 2016)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/charges/index.php
M htdocs/core/class/commonobjectline.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/filefunc.inc.php
M htdocs/product/class/productcustomerprice.class.php
M htdocs/societe/price.php
M scripts/emailings/mailing-send.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: d44c04877af37e936025e31714b4c6d148a6449d
https://github.com/Dolibarr/dolibarr/commit/d44c04877af37e936025e31714b4c6d148a6449d
Author: Florian HENRY <address@hidden>
Date: 2016-02-17 (Wed, 17 Feb 2016)
Changed paths:
M htdocs/core/modules/rapport/pdf_paiement.class.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 9ef5d02459dfe379874417c99a0e54e1799d345f
https://github.com/Dolibarr/dolibarr/commit/9ef5d02459dfe379874417c99a0e54e1799d345f
Author: Florian HENRY <address@hidden>
Date: 2016-02-26 (Fri, 26 Feb 2016)
Changed paths:
M htdocs/comm/prospect/list.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 50decb35cd7b6064f51f68260a84fb1b9529e1c7
https://github.com/Dolibarr/dolibarr/commit/50decb35cd7b6064f51f68260a84fb1b9529e1c7
Author: Florian HENRY <address@hidden>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Changed paths:
M htdocs/comm/card.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/core/lib/admin.lib.php
M htdocs/fourn/facture/list.php
M htdocs/projet/activity/index.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: f9d8aba32568ac52a6478966c372230bcae5c43e
https://github.com/Dolibarr/dolibarr/commit/f9d8aba32568ac52a6478966c372230bcae5c43e
Author: Regis Houssin <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Fix: wrong modelpdf var name
Commit: e03f4b4de98e426046f55cd726f7414ab2ba799e
https://github.com/Dolibarr/dolibarr/commit/e03f4b4de98e426046f55cd726f7414ab2ba799e
Author: phf <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Fix can't send mail to thirdparty contact if no mail defined on thirdparty
card
Commit: 967ae720ef5671db991b0d3f829696d444100dab
https://github.com/Dolibarr/dolibarr/commit/967ae720ef5671db991b0d3f829696d444100dab
Author: Regis Houssin <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix: compatibility with multicompany transversal mode
Commit: 83ababeeacf191f7f587fc73be0d71b110ee891b
https://github.com/Dolibarr/dolibarr/commit/83ababeeacf191f7f587fc73be0d71b110ee891b
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
Merge pull request #4727 from hregis/3.8_fichinter
Fix: wrong modelpdf var name
Commit: a73b53ff9cf52f30eb5a6b21bc7244dc02cba640
https://github.com/Dolibarr/dolibarr/commit/a73b53ff9cf52f30eb5a6b21bc7244dc02cba640
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/societe/soc.php
Log Message:
-----------
Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
Commit: bd0320dea08263c5ea5b8ff806e26f892d4891ff
https://github.com/Dolibarr/dolibarr/commit/bd0320dea08263c5ea5b8ff806e26f892d4891ff
Author: philippe grand <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/langs/fr_FR/products.lang
Log Message:
-----------
fix : missing traduction
Commit: 8ba8182c648271a95cc3655ca935098cb0495494
https://github.com/Dolibarr/dolibarr/commit/8ba8182c648271a95cc3655ca935098cb0495494
Author: philippe grand <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/fichinter/card.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8
Commit: 735a1c075edfddeb6709c3705a07bc15495cc58b
https://github.com/Dolibarr/dolibarr/commit/735a1c075edfddeb6709c3705a07bc15495cc58b
Author: Regis Houssin <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix: best sql request
Commit: 5292920a84ccb06ad71c8c717bf508cb695e95bd
https://github.com/Dolibarr/dolibarr/commit/5292920a84ccb06ad71c8c717bf508cb695e95bd
Author: Regis Houssin <address@hidden>
Date: 2016-03-04 (Fri, 04 Mar 2016)
Changed paths:
M htdocs/societe/commerciaux.php
Log Message:
-----------
Fix: don't see the sales representative of anothers entities
Commit: 210d8435daaafa5678f1c2c83abc0345c867912a
https://github.com/Dolibarr/dolibarr/commit/210d8435daaafa5678f1c2c83abc0345c867912a
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-06 (Sun, 06 Mar 2016)
Changed paths:
M
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
Log Message:
-----------
FIX The part added with hidden option MAIN_DOC_USE_TIMING was included
with a . instead of -. This make os think it is part of extension
instead of file name.
Commit: 886aa1f8b61ad47ab73f995360493e89404217cc
https://github.com/Dolibarr/dolibarr/commit/886aa1f8b61ad47ab73f995360493e89404217cc
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-06 (Sun, 06 Mar 2016)
Changed paths:
M htdocs/fichinter/card.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/societe/commerciaux.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 896f60a4786a7f1e71253620d35398589011be68
https://github.com/Dolibarr/dolibarr/commit/896f60a4786a7f1e71253620d35398589011be68
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-06 (Sun, 06 Mar 2016)
Changed paths:
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
Log Message:
-----------
hidden solution to solve files overwriting each other
Commit: 5fb6db9da37352c77f6750d5d24aca873f7d8e12
https://github.com/Dolibarr/dolibarr/commit/5fb6db9da37352c77f6750d5d24aca873f7d8e12
Author: Juanjo Menent <address@hidden>
Date: 2016-03-06 (Sun, 06 Mar 2016)
Changed paths:
M htdocs/societe/class/societe.class.php
M htdocs/societe/commerciaux.php
Log Message:
-----------
Merge pull request #4732 from hregis/3.8_bug
Fix: compatibility with multicompany transversal mode
Commit: 7a65ebe2b437a02ea7cccc18c15392f437e9b66f
https://github.com/Dolibarr/dolibarr/commit/7a65ebe2b437a02ea7cccc18c15392f437e9b66f
Author: Juanjo Menent <address@hidden>
Date: 2016-03-06 (Sun, 06 Mar 2016)
Changed paths:
M htdocs/langs/fr_FR/products.lang
Log Message:
-----------
Merge pull request #4733 from grandoc/3.8
3.8
Commit: 002a3888f4849ae102f6d324953e86a1287f3cac
https://github.com/Dolibarr/dolibarr/commit/002a3888f4849ae102f6d324953e86a1287f3cac
Author: Florian HENRY <address@hidden>
Date: 2016-03-07 (Mon, 07 Mar 2016)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contrat/card.php
M
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M htdocs/fichinter/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/facture/card.php
M htdocs/fourn/facture/list.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/products.lang
M htdocs/product/admin/product.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/commerciaux.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: a8e2b49c5ba454f8ae9d6d07abca0febcce9d05e
https://github.com/Dolibarr/dolibarr/commit/a8e2b49c5ba454f8ae9d6d07abca0febcce9d05e
Author: Florian HENRY <address@hidden>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/product/document.php
Log Message:
-----------
FIX : #4768
Commit: 4bf2da4af74ccb99879848bfefeae2deeae3ed5d
https://github.com/Dolibarr/dolibarr/commit/4bf2da4af74ccb99879848bfefeae2deeae3ed5d
Author: Florian HENRY <address@hidden>
Date: 2016-03-08 (Tue, 08 Mar 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/tables/llx_actioncomm.sql
Log Message:
-----------
revert SQL changes
Commit: b58e155a6f86bcc6bcf6c09842e587c0fb672bf1
https://github.com/Dolibarr/dolibarr/commit/b58e155a6f86bcc6bcf6c09842e587c0fb672bf1
Author: Florian HENRY <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/tables/llx_holiday_users.sql
Log Message:
-----------
FIX : #4785
Commit: e346559219495634b64b8f010f33936f5219fa31
https://github.com/Dolibarr/dolibarr/commit/e346559219495634b64b8f010f33936f5219fa31
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/tables/llx_holiday_users.sql
M htdocs/product/document.php
Log Message:
-----------
Merge pull request #4770 from FHenry/3.8
FIX : #4768
Commit: 80805f78ea409bfa6ee837cc6cbcf49db028a4fa
https://github.com/Dolibarr/dolibarr/commit/80805f78ea409bfa6ee837cc6cbcf49db028a4fa
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Disable too dangerous patch. Fix must be done by doing an insert only
without creating/renaming databases.
Commit: f742d4ec663422f9d6e3c9bfddb25e663b6025a9
https://github.com/Dolibarr/dolibarr/commit/f742d4ec663422f9d6e3c9bfddb25e663b6025a9
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
Log Message:
-----------
Fix code corrupting database
Commit: d663b28dace1650264848118db4c309f33779da2
https://github.com/Dolibarr/dolibarr/commit/d663b28dace1650264848118db4c309f33779da2
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_holiday_users.sql
Log Message:
-----------
Fix no database structure change is allowed into minor versions
Commit: 3b035819a9bda711f6560a0ae04d4129898fa126
https://github.com/Dolibarr/dolibarr/commit/3b035819a9bda711f6560a0ae04d4129898fa126
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-10 (Thu, 10 Mar 2016)
Changed paths:
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
M
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
M htdocs/fichinter/card.php
M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
M htdocs/install/mysql/tables/llx_holiday_users.sql
M htdocs/product/document.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/commerciaux.php
M htdocs/societe/soc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
htdocs/product/document.php
htdocs/societe/commerciaux.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/9463b26476f5...3b035819a9bd