[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 649f53: delete extrafield on delete i
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 649f53: delete extrafield on delete invoice |
|
Date: |
Sun, 30 Mar 2014 15:45:14 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 649f535d56fc89176d9c4dd1896d6cf8700b782b
https://github.com/Dolibarr/dolibarr/commit/649f535d56fc89176d9c4dd1896d6cf8700b782b
Author: Florian Henry <address@hidden>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
delete extrafield on delete invoice
Commit: b7bfadd660597d7e2221d75c144046f815dec6d4
https://github.com/Dolibarr/dolibarr/commit/b7bfadd660597d7e2221d75c144046f815dec6d4
Author: Florian Henry <address@hidden>
Date: 2014-03-15 (Sat, 15 Mar 2014)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Commit: 10fda1956f3ff18f477b7243d4b64487f65fcc7d
https://github.com/Dolibarr/dolibarr/commit/10fda1956f3ff18f477b7243d4b64487f65fcc7d
Author: Florian Henry <address@hidden>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M htdocs/categories/photos.php
M htdocs/compta/facture.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/fourn/commande/fiche.php
M htdocs/install/mysql/migration/repair.sql
M htdocs/product/photos.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/FilesLibTest.php
M test/phpunit/ImportTest.php
Log Message:
-----------
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Commit: c8c4a10a06464d84f19d0e665057fe3a847cf6db
https://github.com/Dolibarr/dolibarr/commit/c8c4a10a06464d84f19d0e665057fe3a847cf6db
Author: Florian Henry <address@hidden>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/treso.php
Log Message:
-----------
Fix restrictedearea bug
Commit: 4bd6f1111233af6594ef3048c2605d2879167bce
https://github.com/Dolibarr/dolibarr/commit/4bd6f1111233af6594ef3048c2605d2879167bce
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M htdocs/core/class/conf.class.php
Log Message:
-----------
Backport fix to solve warning problems.
Commit: 1061a650d200ad159d8fe5c2b2624561f30ebb7a
https://github.com/Dolibarr/dolibarr/commit/1061a650d200ad159d8fe5c2b2624561f30ebb7a
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
Log Message:
-----------
Fix: duplicate info
Commit: a1e778c146afe3ede7c152670bc8119eacf125e3
https://github.com/Dolibarr/dolibarr/commit/a1e778c146afe3ede7c152670bc8119eacf125e3
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M htdocs/core/class/conf.class.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
M test/phpunit/Example_import_company_1.csv
M test/phpunit/FilesLibTest.php
M test/phpunit/ImportTest.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: e0b4bd9b0dbe0176a89a6226f39fb78bf765486f
https://github.com/Dolibarr/dolibarr/commit/e0b4bd9b0dbe0176a89a6226f39fb78bf765486f
Author: Juanjo Menent <address@hidden>
Date: 2014-03-22 (Sat, 22 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
Log Message:
-----------
Fix: [ bug #1306 ] Fatal error when adding an external calendar
Commit: 466de67b5b8bec3c81fb43cc70e6bca6524c3051
https://github.com/Dolibarr/dolibarr/commit/466de67b5b8bec3c81fb43cc70e6bca6524c3051
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-23 (Sun, 23 Mar 2014)
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/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/pdf/doc_generic_task_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: Solve pb of too many embedded tables
Commit: 57bd043f59227dfbcce34ffe79d446da98a6403e
https://github.com/Dolibarr/dolibarr/commit/57bd043f59227dfbcce34ffe79d446da98a6403e
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-23 (Sun, 23 Mar 2014)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix: Missing lang loading
Commit: 6039c81845ce705c35f2acdea1a1b24419d75ec4
https://github.com/Dolibarr/dolibarr/commit/6039c81845ce705c35f2acdea1a1b24419d75ec4
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-23 (Sun, 23 Mar 2014)
Changed paths:
M htdocs/core/lib/company.lib.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix: copy to clipboard does not work with jmobile
Fix: Bad translation
Commit: 3f78fe8c936302dbb78c1aab9e1cf209828cfebb
https://github.com/Dolibarr/dolibarr/commit/3f78fe8c936302dbb78c1aab9e1cf209828cfebb
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-23 (Sun, 23 Mar 2014)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix: Avoid to get duplicate field
Commit: f115501ddf2f90de2e353b42fc2278d4cbd05e28
https://github.com/Dolibarr/dolibarr/commit/f115501ddf2f90de2e353b42fc2278d4cbd05e28
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-24 (Mon, 24 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/compta/facture.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/install/mysql/migration/repair.sql
M test/phpunit/Example_import_company_1.csv
M test/phpunit/FilesLibTest.php
M test/phpunit/ImportTest.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: bb07d7f8147d4726c7c9658d65c0ce59fdd47015
https://github.com/Dolibarr/dolibarr/commit/bb07d7f8147d4726c7c9658d65c0ce59fdd47015
Author: Florian Henry <address@hidden>
Date: 2014-03-24 (Mon, 24 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/compta/facture.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.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/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/pdf/doc_generic_task_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/langs/en_US/admin.lang
Log Message:
-----------
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
Commit: e16385b4966fbc3ec5688aea610c9aa8b16e8648
https://github.com/Dolibarr/dolibarr/commit/e16385b4966fbc3ec5688aea610c9aa8b16e8648
Author: Cedric <address@hidden>
Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
FIX :[bug #1309]
Commit: 57cf3846171a2a1393d5c2a9fcdb0aec64a3c8ba
https://github.com/Dolibarr/dolibarr/commit/57cf3846171a2a1393d5c2a9fcdb0aec64a3c8ba
Author: Cedric <address@hidden>
Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
Keep value on validtions failure
Commit: 3d12979b3f975fee82d4416615b88952d848e58e
https://github.com/Dolibarr/dolibarr/commit/3d12979b3f975fee82d4416615b88952d848e58e
Author: Florian Henry <address@hidden>
Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/expedition/note.php
M htdocs/fourn/facture/fiche.php
M htdocs/projet/tasks/task.php
Log Message:
-----------
remove debug string
Commit: f97c8feb546951a5f3f2621324ec3ee5b034c0fb
https://github.com/Dolibarr/dolibarr/commit/f97c8feb546951a5f3f2621324ec3ee5b034c0fb
Author: Alexis Algoud <address@hidden>
Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths:
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
fix can't add line with product in supplier order
Commit: c6b700d449bb63137999c28f153c6929f7084b3d
https://github.com/Dolibarr/dolibarr/commit/c6b700d449bb63137999c28f153c6929f7084b3d
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M htdocs/comm/action/index.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/expedition/note.php
M htdocs/fourn/facture/fiche.php
M htdocs/projet/tasks/task.php
Log Message:
-----------
Merge pull request #1502 from FHenry/3.5
Fix restrictedearea bug & delete extrafield on delete invoice
Commit: f282ffc549651ba9d3f8d174179a7b7a909fe54b
https://github.com/Dolibarr/dolibarr/commit/f282ffc549651ba9d3f8d174179a7b7a909fe54b
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M htdocs/comm/action/fiche.php
Log Message:
-----------
Merge pull request #1508 from KreizIT/3.5
FIX :[bug #1309]
Commit: 832ebb1cfec8bdef6275c6afd0406985aa195add
https://github.com/Dolibarr/dolibarr/commit/832ebb1cfec8bdef6275c6afd0406985aa195add
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths:
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
Merge pull request #1512 from atm-alexis/3.5
fix can't add line with product in supplier order
Commit: acb752c5f253895cc6014033f7265947e1303edf
https://github.com/Dolibarr/dolibarr/commit/acb752c5f253895cc6014033f7265947e1303edf
Author: Juanjo Menent <address@hidden>
Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Fix: Margin tabs bad data show
Commit: 61f649e1aed2e79d3a81e51155dcf937a7a38ba0
https://github.com/Dolibarr/dolibarr/commit/61f649e1aed2e79d3a81e51155dcf937a7a38ba0
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-29 (Sat, 29 Mar 2014)
Changed paths:
M htdocs/compta/bank/fiche.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/cron/card.php
M htdocs/public/test/test_arrays.php
A htdocs/public/test/test_forms.php
Log Message:
-----------
Fix: When select_date is called with '' as preselected date,
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
Commit: a5c2b785656805ecc93fe1f9176d0609a9951940
https://github.com/Dolibarr/dolibarr/commit/a5c2b785656805ecc93fe1f9176d0609a9951940
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-29 (Sat, 29 Mar 2014)
Changed paths:
M ChangeLog
M htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/expedition/note.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/projet/tasks/task.php
Log Message:
-----------
Merge branch '3.5' of address@hidden:Dolibarr/dolibarr.git into 3.5
Commit: c506e59d8c12f5da114ae1bb407757891e5443fe
https://github.com/Dolibarr/dolibarr/commit/c506e59d8c12f5da114ae1bb407757891e5443fe
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-30 (Sun, 30 Mar 2014)
Changed paths:
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/cameleo/style.css.php
Log Message:
-----------
Look: Minor fix to not have calendar picto to glue to input
Commit: 95793a5475a131c141d819ceb3be2c046e6e5ab7
https://github.com/Dolibarr/dolibarr/commit/95793a5475a131c141d819ceb3be2c046e6e5ab7
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-30 (Sun, 30 Mar 2014)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Fix: fields into group by of sql requests for module margins must be
same than fields into select.
Commit: ed49f8844629df216f3512344d2eaff0f156f008
https://github.com/Dolibarr/dolibarr/commit/ed49f8844629df216f3512344d2eaff0f156f008
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths:
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
Log Message:
-----------
Fix: deleting files into backup system tools.
Fix: Dump using php not not include lock on tables that are deleted.
Commit: b675b9b61025c9c65b64618af6fa86a1c8dd29c9
https://github.com/Dolibarr/dolibarr/commit/b675b9b61025c9c65b64618af6fa86a1c8dd29c9
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths:
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
M htdocs/comm/action/fiche.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/treso.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
M htdocs/core/modules/commande/doc/pdf_einstein.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/pdf/doc_generic_project_odt.modules.php
M htdocs/core/modules/project/task/pdf/doc_generic_task_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/cron/card.php
M htdocs/fourn/commande/fiche.php
M htdocs/langs/en_US/admin.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/public/test/test_arrays.php
A htdocs/public/test/test_forms.php
M htdocs/theme/amarok/style.css.php
M htdocs/theme/auguria/style.css.php
M htdocs/theme/cameleo/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/3d8fb60f945e...b675b9b61025