[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 619bcb: object must be reloaded befor
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 619bcb: object must be reloaded before creating pdf on con... |
|
Date: |
Fri, 23 Jan 2015 09:49:21 -0800 |
Branch: refs/heads/3.6_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: 619bcb44df5bd39bc0af4aeab58b7a51d9465336
https://github.com/Dolibarr/dolibarr/commit/619bcb44df5bd39bc0af4aeab58b7a51d9465336
Author: jean <address@hidden>
Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths:
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
object must be reloaded before creating pdf on confirmation and ordering
Commit: 5ec0b32ab0625f2dd7e603da75249c8233b79b16
https://github.com/Dolibarr/dolibarr/commit/5ec0b32ab0625f2dd7e603da75249c8233b79b16
Author: jean <address@hidden>
Date: 2015-01-20 (Tue, 20 Jan 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
add left joins on llx_c_actiocomm
Commit: b809f0aeb899869ddf9308343cd9c6c12a44fa8f
https://github.com/Dolibarr/dolibarr/commit/b809f0aeb899869ddf9308343cd9c6c12a44fa8f
Author: jean <address@hidden>
Date: 2015-01-20 (Tue, 20 Jan 2015)
Changed paths:
M COPYRIGHT
M ChangeLog
M build/debian/changelog
M build/debian/control
M build/debian/copyright
A build/exe/doliwamp/.gitignore
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M dev/codesniffer/ruleset.xml
M htdocs/adherents/admin/adherent_type_extrafields.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/fiche.php
M htdocs/admin/commande.php
M htdocs/admin/ihm.php
M htdocs/admin/ldap_groups.php
M htdocs/admin/menus/other.php
M htdocs/admin/stock.php
M htdocs/admin/system/database.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/index.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/purge.php
M htdocs/admin/tools/update.php
M htdocs/admin/translation.php
M htdocs/admin/workflow.php
M htdocs/cashdesk/affIndex.php
M htdocs/cashdesk/facturation.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/categories/fiche.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/index.php
M htdocs/comm/fiche.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/propal.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/prospect/list.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/customer.php
M htdocs/commande/fiche.php
M htdocs/compta/bank/treso.php
M htdocs/compta/charges/index.php
M htdocs/compta/facture.php
M htdocs/compta/facture/apercu.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/paiement.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/sociales/charges.php
M htdocs/contact/canvas/actions_contactcard_common.class.php
M htdocs/contact/canvas/default/actions_contactcard_default.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/actions_extrafields.inc.php
M htdocs/core/actions_sendmails.inc.php
M htdocs/core/actions_setnotes.inc.php
M htdocs/core/boxes/box_activity.php
M htdocs/core/boxes/box_clients.php
M htdocs/core/boxes/box_prospect.php
M htdocs/core/class/canvas.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/dolprintipp.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formcron.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/datepicker.php
M htdocs/core/db/DoliDB.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/date.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/lib/holiday.lib.php
M htdocs/core/lib/invoice2.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/lib/product.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/lib/treeview.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/lib/usergroups.lib.php
M htdocs/core/lib/ws.lib.php
M htdocs/core/login/functions_empty.php
M htdocs/core/login/functions_forceuser.php
M htdocs/core/login/functions_http.php
M htdocs/core/login/functions_ldap.php
M htdocs/core/login/functions_openid.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/action/rapport.pdf.php
M htdocs/core/modules/barcode/mod_barcode_product_standard.php
M htdocs/core/modules/cheque/pdf/pdf_blochet.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/contract/doc/pdf_strato.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/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/member/doc/pdf_standard.class.php
M htdocs/core/modules/modSalaries.class.php
M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/product/mod_codeproduct_leopard.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/propale/modules_propale.php
M htdocs/core/modules/rapport/pdf_paiement.class.php
M htdocs/core/modules/societe/mod_codeclient_elephant.php
M htdocs/core/modules/societe/mod_codeclient_leopard.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.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/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/fiche.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fichinter/document.php
M htdocs/fichinter/fiche.php
M htdocs/filefunc.inc.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/fourn/facture/paiement.php
M htdocs/fourn/fiche.php
M htdocs/holiday/define_holiday.php
M htdocs/imports/import.php
M htdocs/install/mssql/functions/functions.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/compta.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/langs/en_US/resource.lang
M htdocs/langs/es_ES/projects.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/compta.lang
M htdocs/langs/fr_FR/resource.lang
M htdocs/livraison/class/livraison.class.php
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/index.php
M htdocs/margin/lib/margins.lib.php
M htdocs/margin/productMargins.php
M htdocs/opensurvey/fonctions.php
M htdocs/opensurvey/results.php
M htdocs/paypal/lib/paypal.lib.php
M htdocs/printipp/admin/printipp.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/class/product.class.php
M htdocs/product/composition/fiche.php
M htdocs/product/document.php
M htdocs/product/fiche.php
M htdocs/product/fournisseurs.php
M htdocs/product/index.php
M htdocs/product/liste.php
M htdocs/product/popuprop.php
M htdocs/product/price.php
M htdocs/product/stats/facture.php
M htdocs/projet/class/task.class.php
M htdocs/projet/element.php
M htdocs/projet/tasks/contact.php
M htdocs/projet/tasks/document.php
M htdocs/projet/tasks/index.php
M htdocs/projet/tasks/note.php
M htdocs/projet/tasks/task.php
M htdocs/projet/tasks/time.php
M htdocs/resource/card.php
M htdocs/resource/class/actions_resource.class.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/resource/class/resource.class.php
M htdocs/societe/ajaxcompanies.php
M htdocs/societe/canvas/actions_card_common.class.php
M htdocs/societe/canvas/company/actions_card_company.class.php
M htdocs/societe/canvas/individual/actions_card_individual.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/index.php
M htdocs/user/class/user.class.php
M htdocs/user/fiche.php
M htdocs/user/group/ldap.php
M htdocs/webservices/server_category.php
M htdocs/webservices/server_contact.php
M htdocs/webservices/server_thirdparty.php
M scripts/odt2pdf/odt2pdf.sh
M test/phpunit/CommandeFournisseurTest.php
M test/phpunit/CommandeTest.php
M test/phpunit/CommonObjectTest.php
M test/phpunit/CompanyBankAccountTest.php
M test/phpunit/EntrepotTest.php
M test/phpunit/ExportTest.php
M test/phpunit/FactureRecTest.php
M test/phpunit/FactureTest.php
M test/phpunit/FunctionsLibTest.php
M test/phpunit/PropalTest.php
M test/phpunit/SocieteTest.php
M test/phpunit/UserTest.php
M test/phpunit/WebservicesInvoicesTest.php
M test/phpunit/WebservicesThirdpartyTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6
Commit: 3af67b414ef5981e5813e064e72bc03b232ea6b2
https://github.com/Dolibarr/dolibarr/commit/3af67b414ef5981e5813e064e72bc03b232ea6b2
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M htdocs/core/lib/company.lib.php
M htdocs/fourn/commande/fiche.php
Log Message:
-----------
Merge pull request #2267 from tiaris/3.6
add left joins on llx_c_actioncomm
Commit: b7cff09ce681fd940fa7deb778da7ed525da1c78
https://github.com/Dolibarr/dolibarr/commit/b7cff09ce681fd940fa7deb778da7ed525da1c78
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-22 (Thu, 22 Jan 2015)
Changed paths:
M dev/codesniffer/ruleset.xml
Log Message:
-----------
Fixed travis errors
Commit: 568d5cb5ba8f2eddc729a4b6d362f24fe6fcf1eb
https://github.com/Dolibarr/dolibarr/commit/568d5cb5ba8f2eddc729a4b6d362f24fe6fcf1eb
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-23 (Fri, 23 Jan 2015)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/expedition/class/expedition.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/stocks.lang
Log Message:
-----------
Fixed: Tracking number restored on PDF shipments
Fixed: Translation
Conflicts:
htdocs/langs/en_US/agenda.lang
Commit: e98a2adf653cd202653bb501b7209874a4746539
https://github.com/Dolibarr/dolibarr/commit/e98a2adf653cd202653bb501b7209874a4746539
Author: Laurent Destailleur <address@hidden>
Date: 2015-01-23 (Fri, 23 Jan 2015)
Changed paths:
M ChangeLog
M dev/codesniffer/ruleset.xml
M htdocs/core/lib/company.lib.php
M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/commande/fiche.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/sendings.lang
M htdocs/langs/en_US/stocks.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.6_backported
Compare:
https://github.com/Dolibarr/dolibarr/compare/3547e4ad9940...e98a2adf653c