[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] ece2e1: New: Prepare code to be able
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] ece2e1: New: Prepare code to be able to choose bank accoun... |
|
Date: |
Sun, 14 Jul 2013 11:20:06 -0700 |
Branch: refs/heads/3.4_backported
Home: https://github.com/Dolibarr/dolibarr
Commit: ece2e1afa2752760ea863124764be5dd056f1c54
https://github.com/Dolibarr/dolibarr/commit/ece2e1afa2752760ea863124764be5dd056f1c54
Author: Laurent Destailleur <address@hidden>
Date: 2013-02-23 (Sat, 23 Feb 2013)
Changed paths:
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
New: Prepare code to be able to choose bank account to show when
building pdf and payment mode is withdraw.
Commit: 7ca1cedd12c843cefb1cebd49f59d5c081941b9a
https://github.com/Dolibarr/dolibarr/commit/7ca1cedd12c843cefb1cebd49f59d5c081941b9a
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-07 (Thu, 07 Mar 2013)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
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 htdocs/admin/const.php
M htdocs/admin/dict.php
M htdocs/admin/mails.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal.php
M htdocs/comm/prospect/fiche.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/fiche.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/translate.class.php
M htdocs/core/lib/admin.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFacture.class.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/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/filefunc.inc.php
M htdocs/fourn/commande/fiche.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/install/mysql/migration/repair.sql
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/paypal.lang
M htdocs/langs/fr_FR/main.lang
M htdocs/langs/fr_FR/paypal.lang
M htdocs/theme/amarok/style.css.php
Log Message:
-----------
Merge branch '3.3' of address@hidden:Dolibarr/dolibarr.git into 3.3_backported
Commit: 7aa59ef76e40031828ded866d4b0304910c5f57d
https://github.com/Dolibarr/dolibarr/commit/7aa59ef76e40031828ded866d4b0304910c5f57d
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-23 (Sat, 23 Mar 2013)
Changed paths:
M ChangeLog
M README
M README-FR
M README.md
M dev/skeletons/modMyModule.class.php
M htdocs/admin/expedition.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/propal.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/liste.php
R htdocs/commissions/admin/commissions.php
R htdocs/commissions/index.php
R htdocs/commissions/lib/commissions.lib.php
M htdocs/compta/resultat/index.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/modBanque.class.php
R htdocs/core/modules/modCommissions.class.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/exports/class/export.class.php
M htdocs/index.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/ar_SA/bills.lang
M htdocs/langs/bg_BG/bills.lang
R htdocs/langs/ca_ES/commissions.lang
M htdocs/langs/ca_ES/orders.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/da_DK/bills.lang
M htdocs/langs/el_GR/bills.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
R htdocs/langs/en_US/commissions.lang
M htdocs/langs/en_US/orders.lang
R htdocs/langs/es_ES/commissions.lang
M htdocs/langs/es_ES/orders.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/et_EE/bills.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fi_FI/bills.lang
R htdocs/langs/fr_FR/commissions.lang
M htdocs/langs/fr_FR/orders.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/he_IL/bills.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/hu_HU/bills.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/is_IS/bills.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/ja_JP/bills.lang
M htdocs/langs/nb_NO/bills.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pl_PL/bills.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ro_RO/bills.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/sv_SE/bills.lang
M htdocs/langs/zh_CN/bills.lang
M htdocs/langs/zh_TW/bills.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/product/stock/product.php
M htdocs/societe/admin/societe_extrafields.php
R htdocs/theme/auguria/img/object_commissions.png
R htdocs/theme/bureau2crea/img/object_commissions.png
R htdocs/theme/cameleo/img/object_commissions.png
R htdocs/theme/eldy/img/object_commissions.png
M htdocs/webservices/server_productorservice.php
M htdocs/webservices/server_user.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 738aee444b3264ed2bf1cf526450acf619cc8ffc
https://github.com/Dolibarr/dolibarr/commit/738aee444b3264ed2bf1cf526450acf619cc8ffc
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-24 (Sun, 24 Mar 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Add hidden option to setup font size of information.
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Commit: 50f76ab7db36fd010d165939b9a99588d10f248a
https://github.com/Dolibarr/dolibarr/commit/50f76ab7db36fd010d165939b9a99588d10f248a
Author: Laurent Destailleur <address@hidden>
Date: 2013-03-24 (Sun, 24 Mar 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
Log Message:
-----------
Fix: Better line position of information
Conflicts:
htdocs/core/lib/pdf.lib.php
Commit: 9299f35667ddfa40afe3b57ebfbe083332f7218c
https://github.com/Dolibarr/dolibarr/commit/9299f35667ddfa40afe3b57ebfbe083332f7218c
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-03 (Wed, 03 Apr 2013)
Changed paths:
M htdocs/admin/sms.php
M htdocs/comm/propal.php
M htdocs/commande/fiche.php
M htdocs/compta/facture.php
M htdocs/core/class/fileupload.class.php
M htdocs/core/lib/files.lib.php
M htdocs/expedition/fiche.php
M htdocs/fichinter/fiche.php
M htdocs/fourn/commande/fiche.php
M htdocs/fourn/facture/fiche.php
M htdocs/install/etape5.php
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 9f7bb2f7110fc65c13996ba05758c3b7874f20e7
https://github.com/Dolibarr/dolibarr/commit/9f7bb2f7110fc65c13996ba05758c3b7874f20e7
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-17 (Wed, 17 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/commande.php
M htdocs/admin/propal.php
M htdocs/admin/syslog.php
M htdocs/cashdesk/class/Facturation.class.php
M htdocs/comm/action/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/prospect/fiche.php
M htdocs/comm/prospect/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/releve.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/journal/purchasesjournal.php
M htdocs/compta/journal/sellsjournal.php
M htdocs/compta/sociales/charges.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/compta/tva/fiche.php
M htdocs/core/boxes/box_factures_fourn.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/hookmanager.class.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/json.lib.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/framboise.modules.php
M htdocs/core/modules/mailings/pomme.modules.php
M htdocs/core/modules/mailings/thirdparties.modules.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
M htdocs/core/modules/mailings/xinputfile.modules.php
M htdocs/core/modules/mailings/xinputuser.modules.php
M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/fourn/facture/fiche.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/define_holiday.php
M htdocs/holiday/fiche.php
M htdocs/holiday/index.php
M htdocs/holiday/month_report.php
M htdocs/holiday/view_log.php
M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
M htdocs/langs/ar_SA/admin.lang
M htdocs/langs/bg_BG/admin.lang
M htdocs/langs/ca_ES/admin.lang
M htdocs/langs/ca_ES/margins.lang
M htdocs/langs/da_DK/admin.lang
M htdocs/langs/de_AT/admin.lang
M htdocs/langs/de_DE/admin.lang
M htdocs/langs/el_GR/admin.lang
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/en_US/margins.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/agenda.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/es_ES/install.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/margins.lang
M htdocs/langs/et_EE/admin.lang
M htdocs/langs/fa_IR/admin.lang
M htdocs/langs/fi_FI/admin.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/bills.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/fr_FR/margins.lang
M htdocs/langs/he_IL/admin.lang
M htdocs/langs/hu_HU/admin.lang
M htdocs/langs/is_IS/admin.lang
M htdocs/langs/it_IT/admin.lang
M htdocs/langs/ja_JP/admin.lang
M htdocs/langs/nb_NO/admin.lang
M htdocs/langs/nl_BE/admin.lang
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/propal.lang
M htdocs/langs/pl_PL/admin.lang
M htdocs/langs/pt_BR/admin.lang
M htdocs/langs/pt_PT/admin.lang
M htdocs/langs/ro_RO/admin.lang
M htdocs/langs/ru_RU/admin.lang
M htdocs/langs/sl_SI/admin.lang
M htdocs/langs/sv_SE/admin.lang
M htdocs/langs/tr_TR/admin.lang
M htdocs/langs/zh_CN/admin.lang
M htdocs/langs/zh_TW/admin.lang
M htdocs/paypal/lib/paypal.lib.php
M htdocs/public/demo/index.php
M test/phpunit/NumberingModulesTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: d3ded0f7f71d89c29d0c08446c679147a15db610
https://github.com/Dolibarr/dolibarr/commit/d3ded0f7f71d89c29d0c08446c679147a15db610
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-17 (Wed, 17 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
M htdocs/langs/nb_NO/main.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 271cb73fd78be309058d38117b4f688040c9c927
https://github.com/Dolibarr/dolibarr/commit/271cb73fd78be309058d38117b4f688040c9c927
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Backport feature to send email to sale representatives
Commit: f882cdf6d8eb9f667509932e30b3cbd52d77b98a
https://github.com/Dolibarr/dolibarr/commit/f882cdf6d8eb9f667509932e30b3cbd52d77b98a
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Update script
Commit: 204d0021e41a55ac4f4da91279e269a53e99af29
https://github.com/Dolibarr/dolibarr/commit/204d0021e41a55ac4f4da91279e269a53e99af29
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/doxygen/dolibarr-doxygen.doxyfile
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/makepack-howto.txt
M build/perl/virtualmin/dolibarr.pl
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 htdocs/admin/dict.php
M htdocs/admin/menus/edit.php
M htdocs/comm/action/document.php
M htdocs/comm/propal/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/sociales/document.php
M htdocs/core/class/fileupload.class.php
M htdocs/core/class/hookmanager.class.php
M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
M htdocs/core/modules/modBanque.class.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/externalsite/frames.php
M htdocs/externalsite/frametop.php
M htdocs/filefunc.inc.php
M htdocs/fourn/facture/index.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/commercial.lang
M htdocs/langs/en_US/externalsite.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/commercial.lang
M htdocs/langs/es_ES/externalsite.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/commercial.lang
M htdocs/langs/fr_FR/externalsite.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/langs/nl_NL/bills.lang
M htdocs/product/class/product.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/document.php
M test/phpunit/DateLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: da79a0cc2565b2db22f523ebdd628b2dbe1a3043
https://github.com/Dolibarr/dolibarr/commit/da79a0cc2565b2db22f523ebdd628b2dbe1a3043
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M build/debian/README.howto
M build/debian/po/fr.po
M build/debian/po/templates.pot
M build/debian/rules
M build/launchpad/README
M build/makepack-dolibarr.pl
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 70de5f1f7b72e888aeb69fccdec06b2edf808c22
https://github.com/Dolibarr/dolibarr/commit/70de5f1f7b72e888aeb69fccdec06b2edf808c22
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
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 htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/list.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/modules/syslog/mod_syslog_file.php
M htdocs/includes/nusoap/lib/nusoap.php
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/commercial.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: c215b4769e28c102afcf5bcf382d839dda89730a
https://github.com/Dolibarr/dolibarr/commit/c215b4769e28c102afcf5bcf382d839dda89730a
Author: Laurent Destailleur <address@hidden>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M ChangeLog
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/document.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/info.php
M htdocs/compta/facture.php
M htdocs/compta/facture/impayees.php
M htdocs/compta/index.php
M htdocs/contact/class/contact.class.php
M htdocs/contact/exportimport.php
M htdocs/contact/fiche.php
M htdocs/contact/ldap.php
M htdocs/contact/perso.php
M htdocs/contact/vcard.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/security.lib.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/impayees.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/fiche.php
M htdocs/langs/bg_BG/holiday.lang
A htdocs/langs/ca_ES/holiday.lang
M htdocs/langs/en_US/holiday.lang
M htdocs/langs/es_ES/holiday.lang
M htdocs/langs/fr_FR/holiday.lang
M htdocs/main.inc.php
M htdocs/master.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 351a8f5d392dc8913612687ce7166c3df6a2acbb
https://github.com/Dolibarr/dolibarr/commit/351a8f5d392dc8913612687ce7166c3df6a2acbb
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M ChangeLog
M htdocs/compta/clients.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/rejets.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/db/pgsql.class.php
M htdocs/core/lib/files.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/societe/mod_codeclient_monkey.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/imports/import.php
M htdocs/includes/nusoap/lib/Mail/PEAR.php
M htdocs/includes/nusoap/lib/Mail/mimeDecode.php
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/fiche.php
M test/phpunit/FilesLibTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 82b0c075c14ca1d8851c9d9282e4d29068c45c36
https://github.com/Dolibarr/dolibarr/commit/82b0c075c14ca1d8851c9d9282e4d29068c45c36
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-13 (Mon, 13 May 2013)
Changed paths:
M ChangeLog
M dev/skeletons/modMyModule.class.php
M htdocs/adherents/fiche.php
M htdocs/comm/index.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/prelevement/ligne.php
M htdocs/contact/class/contact.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/lib/barcode.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/login/README.txt
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/filefunc.inc.php
M htdocs/langs/ca_ES/errors.lang
M htdocs/langs/en_US/errors.lang
M htdocs/langs/es_ES/errors.lang
M htdocs/langs/fr_FR/dict.lang
M htdocs/langs/fr_FR/errors.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/user/perms.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: e37799d61a537784628d26af94f810fa185511b0
https://github.com/Dolibarr/dolibarr/commit/e37799d61a537784628d26af94f810fa185511b0
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/modules/modMargin.class.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/freeproductline_create.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/predefinedproductline_create.tpl.php
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 47afef8d5a0ea92a36ed414c0b11977c35c2befe
https://github.com/Dolibarr/dolibarr/commit/47afef8d5a0ea92a36ed414c0b11977c35c2befe
Author: Laurent Destailleur <address@hidden>
Date: 2013-05-22 (Wed, 22 May 2013)
Changed paths:
M htdocs/core/db/mysql.class.php
M htdocs/core/db/mysqli.class.php
M htdocs/core/lib/json.lib.php
M htdocs/fichinter/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 37b7f153c5871c3c245c7c0c3a587c1b0b9abf09
https://github.com/Dolibarr/dolibarr/commit/37b7f153c5871c3c245c7c0c3a587c1b0b9abf09
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-07 (Fri, 07 Jun 2013)
Changed paths:
M ChangeLog
M build/obs/README
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M htdocs/comm/action/listactions.php
M htdocs/commande/liste.php
M htdocs/compta/prelevement/rejets.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/agenda.lib.php
M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
A htdocs/langs/es_MX/banks.lang
M htdocs/langs/es_MX/bills.lang
A htdocs/langs/es_MX/categories.lang
M htdocs/langs/es_MX/companies.lang
A htdocs/langs/es_MX/main.lang
M htdocs/product/class/product.class.php
M htdocs/product/liste.php
M htdocs/projet/class/task.class.php
M htdocs/societe/societe.php
M htdocs/webservices/demo_wsclient_category.php-NORUN
M htdocs/webservices/server_category.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 2e924d0a2f3a7cc24943a1c0b42f28cf7cc1524a
https://github.com/Dolibarr/dolibarr/commit/2e924d0a2f3a7cc24943a1c0b42f28cf7cc1524a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/lib/pdf.lib.php
M htdocs/includes/tcpdf/tcpdf.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 84969c881db42304e1727d465a1ab0748bbb9102
https://github.com/Dolibarr/dolibarr/commit/84969c881db42304e1727d465a1ab0748bbb9102
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 591f84fd0ecd75f01fcb5c8300084a7717b69487
https://github.com/Dolibarr/dolibarr/commit/591f84fd0ecd75f01fcb5c8300084a7717b69487
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-08 (Sat, 08 Jun 2013)
Changed paths:
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
Log Message:
-----------
Add tag object_hour
Commit: c0cc58a8f7d8c14474d053c79f4734551de5bb0a
https://github.com/Dolibarr/dolibarr/commit/c0cc58a8f7d8c14474d053c79f4734551de5bb0a
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M htdocs/compta/facture/impayees.php
Log Message:
-----------
Missing total
Conflicts:
htdocs/compta/facture/impayees.php
Commit: bf59f7fa848b74c6698dce1ffde49d46e57d71f5
https://github.com/Dolibarr/dolibarr/commit/bf59f7fa848b74c6698dce1ffde49d46e57d71f5
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/perl/virtualmin/dolibarr.pl
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 htdocs/comm/propal.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/filefunc.inc.php
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/fr_FR/holiday.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 733d9dafe756fe956854fd0f47e016cb8957d4d3
https://github.com/Dolibarr/dolibarr/commit/733d9dafe756fe956854fd0f47e016cb8957d4d3
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-25 (Tue, 25 Jun 2013)
Changed paths:
M htdocs/admin/index.php
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 331466abc64139846db890670863b21ca5269a4b
https://github.com/Dolibarr/dolibarr/commit/331466abc64139846db890670863b21ca5269a4b
Author: Laurent Destailleur <address@hidden>
Date: 2013-06-27 (Thu, 27 Jun 2013)
Changed paths:
M htdocs/core/modules/mailings/modules_mailings.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 37bd13b49b528547f75bab151961f0e1ba4268e0
https://github.com/Dolibarr/dolibarr/commit/37bd13b49b528547f75bab151961f0e1ba4268e0
Author: Laurent Destailleur <address@hidden>
Date: 2013-07-03 (Wed, 03 Jul 2013)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M test/phpunit/FactureTestRounding.php
Log Message:
-----------
New: [ task #286 ] Enhance rounding function of prices to allow round of
sum instead of sum of rounding
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
Commit: c622233795799ec4f29433bd04ea244a0232bef1
https://github.com/Dolibarr/dolibarr/commit/c622233795799ec4f29433bd04ea244a0232bef1
Author: Laurent Destailleur <address@hidden>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M htdocs/admin/geoipmaxmind.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Commit: 427d177c5bac8ed88a3d4933cd7340fab5ace47f
https://github.com/Dolibarr/dolibarr/commit/427d177c5bac8ed88a3d4933cd7340fab5ace47f
Author: Laurent Destailleur <address@hidden>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
Commit: 651bc379618eaf827d4662c19a4389d8c817a4a5
https://github.com/Dolibarr/dolibarr/commit/651bc379618eaf827d4662c19a4389d8c817a4a5
Author: Laurent Destailleur <address@hidden>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M htdocs/core/class/conf.class.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
Conflicts:
ChangeLog
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
Commit: 06263007a0d00cc668319ea77106776380a63339
https://github.com/Dolibarr/dolibarr/commit/06263007a0d00cc668319ea77106776380a63339
Author: Laurent Destailleur <address@hidden>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
Log Message:
-----------
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
Commit: 493b2ac8279b7abc931e3d7b7b85fcbcb6071d66
https://github.com/Dolibarr/dolibarr/commit/493b2ac8279b7abc931e3d7b7b85fcbcb6071d66
Author: Laurent Destailleur <address@hidden>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/pdf.lib.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/install/inc.php
M scripts/invoices/email_unpaid_invoices_to_customers.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
M test/phpunit/FactureTestRounding.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3_backported' into 3.4_backported
Conflicts:
ChangeLog
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
scripts/invoices/email_unpaid_invoices_to_representatives.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/cc124e03c1c7...493b2ac8279b
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] ece2e1: New: Prepare code to be able to choose bank accoun...,
Laurent Destailleur <=