lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,353 Commits 43 Branches 150 Tags 886 MiB
3.6
Commit Graph

1226 Commits

Author SHA1 Message Date
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contrat/liste.php
 2013-07-31 12:45:39 +02:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4 
Fix : Numbering on supplier invoice was not saved and on shipment displa...
 2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Florian Henry
d6f31d61bf Fix Typhon model $mysoc global is missing 2013-07-29 12:21:52 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
daa10bcedd Fix: EOF 2013-07-27 12:32:04 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2013-07-26 14:59:18 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b CRLF issue 2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c New: Can show images of product onto proposals. 2013-07-26 12:24:30 +02:00
Laurent Destailleur
339118d6f4 Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee Fix: Color no more lost 2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932 Merge pull request #1128 from defrance69/patch-9 
Update pdf_blochet.class.php
 2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/langs/ar_SA/bookmarks.lang
	htdocs/langs/ar_SA/boxes.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/categories.lang
	htdocs/langs/ar_SA/commercial.lang
	htdocs/langs/ar_SA/companies.lang
	htdocs/langs/ar_SA/compta.lang
	htdocs/langs/ar_SA/contracts.lang
	htdocs/langs/ar_SA/deliveries.lang
	htdocs/langs/ar_SA/dict.lang
	htdocs/langs/ar_SA/donations.lang
	htdocs/langs/ar_SA/ecm.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/exports.lang
	htdocs/langs/ar_SA/externalsite.lang
	htdocs/langs/ar_SA/ftp.lang
	htdocs/langs/ar_SA/help.lang
	htdocs/langs/ar_SA/install.lang
	htdocs/langs/ar_SA/interventions.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/ldap.lang
	htdocs/langs/ar_SA/mails.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/members.lang
	htdocs/langs/ar_SA/orders.lang
	htdocs/langs/ar_SA/oscommerce.lang
	htdocs/langs/ar_SA/paybox.lang
	htdocs/langs/ar_SA/paypal.lang
	htdocs/langs/ar_SA/projects.lang
	htdocs/langs/ar_SA/propal.lang
	htdocs/langs/ar_SA/sendings.lang
	htdocs/langs/ar_SA/shop.lang
	htdocs/langs/ar_SA/sms.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/suppliers.lang
	htdocs/langs/ar_SA/trips.lang
	htdocs/langs/ar_SA/users.lang
	htdocs/langs/ar_SA/withdrawals.lang
	htdocs/langs/ar_SA/workflow.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/agenda.lang
	htdocs/langs/bg_BG/banks.lang
	htdocs/langs/bg_BG/bills.lang
	htdocs/langs/bg_BG/bookmarks.lang
	htdocs/langs/bg_BG/boxes.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/categories.lang
	htdocs/langs/bg_BG/commercial.lang
	htdocs/langs/bg_BG/companies.lang
	htdocs/langs/bg_BG/compta.lang
	htdocs/langs/bg_BG/contracts.lang
	htdocs/langs/bg_BG/deliveries.lang
	htdocs/langs/bg_BG/dict.lang
	htdocs/langs/bg_BG/donations.lang
	htdocs/langs/bg_BG/ecm.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/exports.lang
	htdocs/langs/bg_BG/externalsite.lang
	htdocs/langs/bg_BG/ftp.lang
	htdocs/langs/bg_BG/help.lang
	htdocs/langs/bg_BG/holiday.lang
	htdocs/langs/bg_BG/install.lang
	htdocs/langs/bg_BG/interventions.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/ldap.lang
	htdocs/langs/bg_BG/mailmanspip.lang
	htdocs/langs/bg_BG/mails.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/members.lang
	htdocs/langs/bg_BG/orders.lang
	htdocs/langs/bg_BG/oscommerce.lang
	htdocs/langs/bg_BG/other.lang
	htdocs/langs/bg_BG/paybox.lang
	htdocs/langs/bg_BG/paypal.lang
	htdocs/langs/bg_BG/products.lang
	htdocs/langs/bg_BG/projects.lang
	htdocs/langs/bg_BG/propal.lang
	htdocs/langs/bg_BG/sendings.lang
	htdocs/langs/bg_BG/shop.lang
	htdocs/langs/bg_BG/sms.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bg_BG/suppliers.lang
	htdocs/langs/bg_BG/trips.lang
	htdocs/langs/bg_BG/users.lang
	htdocs/langs/bg_BG/withdrawals.lang
	htdocs/langs/bg_BG/workflow.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/da_DK/agenda.lang
	htdocs/langs/da_DK/banks.lang
	htdocs/langs/da_DK/bookmarks.lang
	htdocs/langs/da_DK/boxes.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/categories.lang
	htdocs/langs/da_DK/commercial.lang
	htdocs/langs/da_DK/companies.lang
	htdocs/langs/da_DK/compta.lang
	htdocs/langs/da_DK/contracts.lang
	htdocs/langs/da_DK/deliveries.lang
	htdocs/langs/da_DK/dict.lang
	htdocs/langs/da_DK/donations.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/exports.lang
	htdocs/langs/da_DK/externalsite.lang
	htdocs/langs/da_DK/ftp.lang
	htdocs/langs/da_DK/install.lang
	htdocs/langs/da_DK/interventions.lang
	htdocs/langs/da_DK/languages.lang
	htdocs/langs/da_DK/mails.lang
	htdocs/langs/da_DK/members.lang
	htdocs/langs/da_DK/orders.lang
	htdocs/langs/da_DK/oscommerce.lang
	htdocs/langs/da_DK/paybox.lang
	htdocs/langs/da_DK/paypal.lang
	htdocs/langs/da_DK/projects.lang
	htdocs/langs/da_DK/propal.lang
	htdocs/langs/da_DK/sendings.lang
	htdocs/langs/da_DK/shop.lang
	htdocs/langs/da_DK/sms.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/da_DK/suppliers.lang
	htdocs/langs/da_DK/trips.lang
	htdocs/langs/da_DK/users.lang
	htdocs/langs/da_DK/withdrawals.lang
	htdocs/langs/da_DK/workflow.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/agenda.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/bookmarks.lang
	htdocs/langs/de_DE/boxes.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/categories.lang
	htdocs/langs/de_DE/commercial.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/contracts.lang
	htdocs/langs/de_DE/deliveries.lang
	htdocs/langs/de_DE/dict.lang
	htdocs/langs/de_DE/donations.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/exports.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/ftp.lang
	htdocs/langs/de_DE/help.lang
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/interventions.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/ldap.lang
	htdocs/langs/de_DE/mails.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/oscommerce.lang
	htdocs/langs/de_DE/other.lang
	htdocs/langs/de_DE/paybox.lang
	htdocs/langs/de_DE/paypal.lang
	htdocs/langs/de_DE/products.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/propal.lang
	htdocs/langs/de_DE/sendings.lang
	htdocs/langs/de_DE/shop.lang
	htdocs/langs/de_DE/sms.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/suppliers.lang
	htdocs/langs/de_DE/trips.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/withdrawals.lang
	htdocs/langs/de_DE/workflow.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_US/bookmarks.lang
	htdocs/langs/en_US/ftp.lang
	htdocs/langs/en_US/other.lang
	htdocs/langs/en_US/paypal.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/bookmarks.lang
	htdocs/langs/et_EE/boxes.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/categories.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/contracts.lang
	htdocs/langs/et_EE/deliveries.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/donations.lang
	htdocs/langs/et_EE/ecm.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/exports.lang
	htdocs/langs/et_EE/externalsite.lang
	htdocs/langs/et_EE/ftp.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/install.lang
	htdocs/langs/et_EE/interventions.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/ldap.lang
	htdocs/langs/et_EE/mails.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/members.lang
	htdocs/langs/et_EE/orders.lang
	htdocs/langs/et_EE/oscommerce.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/paybox.lang
	htdocs/langs/et_EE/paypal.lang
	htdocs/langs/et_EE/products.lang
	htdocs/langs/et_EE/projects.lang
	htdocs/langs/et_EE/propal.lang
	htdocs/langs/et_EE/sendings.lang
	htdocs/langs/et_EE/shop.lang
	htdocs/langs/et_EE/sms.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/trips.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/et_EE/workflow.lang
	htdocs/langs/fa_IR/agenda.lang
	htdocs/langs/fa_IR/banks.lang
	htdocs/langs/fa_IR/bookmarks.lang
	htdocs/langs/fa_IR/boxes.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fa_IR/commercial.lang
	htdocs/langs/fa_IR/companies.lang
	htdocs/langs/fa_IR/compta.lang
	htdocs/langs/fa_IR/contracts.lang
	htdocs/langs/fa_IR/deliveries.lang
	htdocs/langs/fa_IR/dict.lang
	htdocs/langs/fa_IR/donations.lang
	htdocs/langs/fa_IR/ecm.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/exports.lang
	htdocs/langs/fa_IR/ftp.lang
	htdocs/langs/fa_IR/help.lang
	htdocs/langs/fa_IR/install.lang
	htdocs/langs/fa_IR/interventions.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/ldap.lang
	htdocs/langs/fa_IR/mails.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/members.lang
	htdocs/langs/fa_IR/orders.lang
	htdocs/langs/fa_IR/oscommerce.lang
	htdocs/langs/fa_IR/paybox.lang
	htdocs/langs/fa_IR/paypal.lang
	htdocs/langs/fa_IR/projects.lang
	htdocs/langs/fa_IR/propal.lang
	htdocs/langs/fa_IR/shop.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fa_IR/suppliers.lang
	htdocs/langs/fa_IR/trips.lang
	htdocs/langs/fa_IR/users.lang
	htdocs/langs/fa_IR/withdrawals.lang
	htdocs/langs/fi_FI/agenda.lang
	htdocs/langs/fi_FI/banks.lang
	htdocs/langs/fi_FI/bookmarks.lang
	htdocs/langs/fi_FI/boxes.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/categories.lang
	htdocs/langs/fi_FI/commercial.lang
	htdocs/langs/fi_FI/companies.lang
	htdocs/langs/fi_FI/compta.lang
	htdocs/langs/fi_FI/contracts.lang
	htdocs/langs/fi_FI/deliveries.lang
	htdocs/langs/fi_FI/dict.lang
	htdocs/langs/fi_FI/donations.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/exports.lang
	htdocs/langs/fi_FI/externalsite.lang
	htdocs/langs/fi_FI/ftp.lang
	htdocs/langs/fi_FI/install.lang
	htdocs/langs/fi_FI/interventions.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/mails.lang
	htdocs/langs/fi_FI/members.lang
	htdocs/langs/fi_FI/orders.lang
	htdocs/langs/fi_FI/paybox.lang
	htdocs/langs/fi_FI/paypal.lang
	htdocs/langs/fi_FI/projects.lang
	htdocs/langs/fi_FI/propal.lang
	htdocs/langs/fi_FI/sendings.lang
	htdocs/langs/fi_FI/sms.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fi_FI/suppliers.lang
	htdocs/langs/fi_FI/trips.lang
	htdocs/langs/fi_FI/users.lang
	htdocs/langs/fi_FI/withdrawals.lang
	htdocs/langs/fi_FI/workflow.lang
	htdocs/langs/fr_FR/bookmarks.lang
	htdocs/langs/fr_FR/externalsite.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/paybox.lang
	htdocs/langs/fr_FR/paypal.lang
	htdocs/langs/he_IL/workflow.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/agenda.lang
	htdocs/langs/hu_HU/banks.lang
	htdocs/langs/hu_HU/bills.lang
	htdocs/langs/hu_HU/boxes.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/commercial.lang
	htdocs/langs/hu_HU/companies.lang
	htdocs/langs/hu_HU/compta.lang
	htdocs/langs/hu_HU/contracts.lang
	htdocs/langs/hu_HU/deliveries.lang
	htdocs/langs/hu_HU/dict.lang
	htdocs/langs/hu_HU/donations.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/exports.lang
	htdocs/langs/hu_HU/externalsite.lang
	htdocs/langs/hu_HU/install.lang
	htdocs/langs/hu_HU/interventions.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/mails.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/members.lang
	htdocs/langs/hu_HU/orders.lang
	htdocs/langs/hu_HU/oscommerce.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/paybox.lang
	htdocs/langs/hu_HU/paypal.lang
	htdocs/langs/hu_HU/projects.lang
	htdocs/langs/hu_HU/propal.lang
	htdocs/langs/hu_HU/sendings.lang
	htdocs/langs/hu_HU/sms.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/suppliers.lang
	htdocs/langs/hu_HU/trips.lang
	htdocs/langs/hu_HU/users.lang
	htdocs/langs/hu_HU/withdrawals.lang
	htdocs/langs/hu_HU/workflow.lang
	htdocs/langs/is_IS/agenda.lang
	htdocs/langs/is_IS/banks.lang
	htdocs/langs/is_IS/bookmarks.lang
	htdocs/langs/is_IS/boxes.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/categories.lang
	htdocs/langs/is_IS/commercial.lang
	htdocs/langs/is_IS/companies.lang
	htdocs/langs/is_IS/compta.lang
	htdocs/langs/is_IS/contracts.lang
	htdocs/langs/is_IS/deliveries.lang
	htdocs/langs/is_IS/dict.lang
	htdocs/langs/is_IS/donations.lang
	htdocs/langs/is_IS/ecm.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/exports.lang
	htdocs/langs/is_IS/externalsite.lang
	htdocs/langs/is_IS/ftp.lang
	htdocs/langs/is_IS/help.lang
	htdocs/langs/is_IS/install.lang
	htdocs/langs/is_IS/interventions.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/ldap.lang
	htdocs/langs/is_IS/mails.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/members.lang
	htdocs/langs/is_IS/orders.lang
	htdocs/langs/is_IS/oscommerce.lang
	htdocs/langs/is_IS/paybox.lang
	htdocs/langs/is_IS/paypal.lang
	htdocs/langs/is_IS/products.lang
	htdocs/langs/is_IS/projects.lang
	htdocs/langs/is_IS/propal.lang
	htdocs/langs/is_IS/sendings.lang
	htdocs/langs/is_IS/shop.lang
	htdocs/langs/is_IS/sms.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/is_IS/suppliers.lang
	htdocs/langs/is_IS/trips.lang
	htdocs/langs/is_IS/users.lang
	htdocs/langs/is_IS/withdrawals.lang
	htdocs/langs/is_IS/workflow.lang
	htdocs/langs/it_IT/bookmarks.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/exports.lang
	htdocs/langs/it_IT/externalsite.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/paybox.lang
	htdocs/langs/it_IT/paypal.lang
	htdocs/langs/it_IT/projects.lang
	htdocs/langs/it_IT/propal.lang
	htdocs/langs/it_IT/sendings.lang
	htdocs/langs/it_IT/sms.lang
	htdocs/langs/it_IT/workflow.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/agenda.lang
	htdocs/langs/ja_JP/banks.lang
	htdocs/langs/ja_JP/bills.lang
	htdocs/langs/ja_JP/bookmarks.lang
	htdocs/langs/ja_JP/boxes.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/categories.lang
	htdocs/langs/ja_JP/commercial.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/ja_JP/deliveries.lang
	htdocs/langs/ja_JP/dict.lang
	htdocs/langs/ja_JP/donations.lang
	htdocs/langs/ja_JP/ecm.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/exports.lang
	htdocs/langs/ja_JP/externalsite.lang
	htdocs/langs/ja_JP/ftp.lang
	htdocs/langs/ja_JP/help.lang
	htdocs/langs/ja_JP/install.lang
	htdocs/langs/ja_JP/interventions.lang
	htdocs/langs/ja_JP/languages.lang
	htdocs/langs/ja_JP/ldap.lang
	htdocs/langs/ja_JP/mails.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/members.lang
	htdocs/langs/ja_JP/orders.lang
	htdocs/langs/ja_JP/oscommerce.lang
	htdocs/langs/ja_JP/other.lang
	htdocs/langs/ja_JP/paybox.lang
	htdocs/langs/ja_JP/paypal.lang
	htdocs/langs/ja_JP/products.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/propal.lang
	htdocs/langs/ja_JP/sendings.lang
	htdocs/langs/ja_JP/shop.lang
	htdocs/langs/ja_JP/sms.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ja_JP/suppliers.lang
	htdocs/langs/ja_JP/trips.lang
	htdocs/langs/ja_JP/users.lang
	htdocs/langs/ja_JP/withdrawals.lang
	htdocs/langs/ja_JP/workflow.lang
	htdocs/langs/nb_NO/agenda.lang
	htdocs/langs/nb_NO/banks.lang
	htdocs/langs/nb_NO/bookmarks.lang
	htdocs/langs/nb_NO/boxes.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/categories.lang
	htdocs/langs/nb_NO/commercial.lang
	htdocs/langs/nb_NO/companies.lang
	htdocs/langs/nb_NO/compta.lang
	htdocs/langs/nb_NO/contracts.lang
	htdocs/langs/nb_NO/deliveries.lang
	htdocs/langs/nb_NO/dict.lang
	htdocs/langs/nb_NO/donations.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/exports.lang
	htdocs/langs/nb_NO/externalsite.lang
	htdocs/langs/nb_NO/ftp.lang
	htdocs/langs/nb_NO/help.lang
	htdocs/langs/nb_NO/install.lang
	htdocs/langs/nb_NO/interventions.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/ldap.lang
	htdocs/langs/nb_NO/mails.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/members.lang
	htdocs/langs/nb_NO/orders.lang
	htdocs/langs/nb_NO/paybox.lang
	htdocs/langs/nb_NO/paypal.lang
	htdocs/langs/nb_NO/projects.lang
	htdocs/langs/nb_NO/propal.lang
	htdocs/langs/nb_NO/sendings.lang
	htdocs/langs/nb_NO/sms.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/suppliers.lang
	htdocs/langs/nb_NO/trips.lang
	htdocs/langs/nb_NO/users.lang
	htdocs/langs/nb_NO/withdrawals.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/nl_NL/propal.lang
	htdocs/langs/nl_NL/workflow.lang
	htdocs/langs/pl_PL/agenda.lang
	htdocs/langs/pl_PL/banks.lang
	htdocs/langs/pl_PL/bookmarks.lang
	htdocs/langs/pl_PL/boxes.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/categories.lang
	htdocs/langs/pl_PL/commercial.lang
	htdocs/langs/pl_PL/companies.lang
	htdocs/langs/pl_PL/compta.lang
	htdocs/langs/pl_PL/contracts.lang
	htdocs/langs/pl_PL/deliveries.lang
	htdocs/langs/pl_PL/dict.lang
	htdocs/langs/pl_PL/donations.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/exports.lang
	htdocs/langs/pl_PL/externalsite.lang
	htdocs/langs/pl_PL/ftp.lang
	htdocs/langs/pl_PL/install.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pl_PL/languages.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/members.lang
	htdocs/langs/pl_PL/orders.lang
	htdocs/langs/pl_PL/other.lang
	htdocs/langs/pl_PL/paybox.lang
	htdocs/langs/pl_PL/paypal.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/pl_PL/propal.lang
	htdocs/langs/pl_PL/sendings.lang
	htdocs/langs/pl_PL/sms.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/suppliers.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/users.lang
	htdocs/langs/pl_PL/withdrawals.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/ro_RO/agenda.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bookmarks.lang
	htdocs/langs/ro_RO/boxes.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/commercial.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/contracts.lang
	htdocs/langs/ro_RO/deliveries.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/donations.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/exports.lang
	htdocs/langs/ro_RO/externalsite.lang
	htdocs/langs/ro_RO/interventions.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/mails.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/members.lang
	htdocs/langs/ro_RO/orders.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/paybox.lang
	htdocs/langs/ro_RO/paypal.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ro_RO/propal.lang
	htdocs/langs/ro_RO/sendings.lang
	htdocs/langs/ro_RO/sms.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/langs/ro_RO/users.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/ro_RO/workflow.lang
	htdocs/langs/ru_RU/agenda.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/bookmarks.lang
	htdocs/langs/ru_RU/boxes.lang
	htdocs/langs/ru_RU/companies.lang
	htdocs/langs/ru_RU/compta.lang
	htdocs/langs/ru_RU/contracts.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/exports.lang
	htdocs/langs/ru_RU/externalsite.lang
	htdocs/langs/ru_RU/install.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/members.lang
	htdocs/langs/ru_RU/orders.lang
	htdocs/langs/ru_RU/paybox.lang
	htdocs/langs/ru_RU/paypal.lang
	htdocs/langs/ru_RU/propal.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_UA/main.lang
	htdocs/langs/sl_SI/agenda.lang
	htdocs/langs/sl_SI/boxes.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/companies.lang
	htdocs/langs/sl_SI/compta.lang
	htdocs/langs/sl_SI/contracts.lang
	htdocs/langs/sl_SI/dict.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/exports.lang
	htdocs/langs/sl_SI/externalsite.lang
	htdocs/langs/sl_SI/install.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/mails.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/members.lang
	htdocs/langs/sl_SI/orders.lang
	htdocs/langs/sl_SI/paybox.lang
	htdocs/langs/sl_SI/paypal.lang
	htdocs/langs/sl_SI/propal.lang
	htdocs/langs/sl_SI/sendings.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sl_SI/suppliers.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/boxes.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/commercial.lang
	htdocs/langs/sv_SE/companies.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/contracts.lang
	htdocs/langs/sv_SE/deliveries.lang
	htdocs/langs/sv_SE/dict.lang
	htdocs/langs/sv_SE/donations.lang
	htdocs/langs/sv_SE/ecm.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/exports.lang
	htdocs/langs/sv_SE/externalsite.lang
	htdocs/langs/sv_SE/ftp.lang
	htdocs/langs/sv_SE/help.lang
	htdocs/langs/sv_SE/install.lang
	htdocs/langs/sv_SE/interventions.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/ldap.lang
	htdocs/langs/sv_SE/mails.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/orders.lang
	htdocs/langs/sv_SE/oscommerce.lang
	htdocs/langs/sv_SE/other.lang
	htdocs/langs/sv_SE/paybox.lang
	htdocs/langs/sv_SE/paypal.lang
	htdocs/langs/sv_SE/products.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/sendings.lang
	htdocs/langs/sv_SE/shop.lang
	htdocs/langs/sv_SE/sms.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/suppliers.lang
	htdocs/langs/sv_SE/trips.lang
	htdocs/langs/sv_SE/users.lang
	htdocs/langs/sv_SE/withdrawals.lang
	htdocs/langs/sv_SE/workflow.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/banks.lang
	htdocs/langs/zh_CN/bookmarks.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/deliveries.lang
	htdocs/langs/zh_CN/dict.lang
	htdocs/langs/zh_CN/donations.lang
	htdocs/langs/zh_CN/ecm.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/externalsite.lang
	htdocs/langs/zh_CN/ftp.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/oscommerce.lang
	htdocs/langs/zh_CN/paybox.lang
	htdocs/langs/zh_CN/paypal.lang
	htdocs/langs/zh_CN/projects.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/sendings.lang
	htdocs/langs/zh_CN/shop.lang
	htdocs/langs/zh_CN/sms.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/trips.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_CN/withdrawals.lang
	htdocs/langs/zh_CN/workflow.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/bookmarks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/deliveries.lang
	htdocs/langs/zh_TW/ecm.lang
	htdocs/langs/zh_TW/externalsite.lang
	htdocs/langs/zh_TW/oscommerce.lang
	htdocs/langs/zh_TW/paypal.lang
	htdocs/langs/zh_TW/shop.lang
	htdocs/langs/zh_TW/sms.lang
	htdocs/langs/zh_TW/trips.lang
	htdocs/langs/zh_TW/withdrawals.lang
	htdocs/langs/zh_TW/workflow.lang
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/members/sync_members_ldap2dolibarr.php
 2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Florian Henry
0ce833d282 Fix bug export contact extrafields 2013-07-24 15:19:05 +02:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
BENKE Charles
34c09c3aa5 Update pdf_blochet.class.php 
add ref_ext on pdf output if not empty
 2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24 Merge pull request #1127 from csalvador/taskpdffix 
fix pdf model import
 2013-07-24 01:30:55 -07:00
Cédric Salvador
35faff04e9 fix pdf model import 2013-07-23 15:59:41 +02:00
BENKE Charles
8c7c3f03d3 Update modBanque.class.php 
Add bordereau ref_ext fields on export
 2013-07-23 05:54:47 +02:00
Juanjo Menent
d7da816258 Merge pull request #1114 from defrance69/patch-5 
Update modBanque.class.php
 2013-07-22 00:05:46 -07:00
BENKE Charles
c555c17315 Update modBanque.class.php 
Add Export of check deposit / bill
 2013-07-20 23:47:37 +02:00
Geoffrey
27e26c872e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c Fix: Restore error message, but only when required. 2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65 Fix: syntax error 2013-07-19 17:18:44 +02:00
Raphaël Doursenaud
e119a5c650 Avoid printing errors on documents that are fine without 2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
22f57e3350 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-18 19:02:02 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Florian Henry
9d942017ee Merge remote-tracking branch 'origin/develop' into develop_T165 2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310 [ task #165 ] Add export of multiprices 2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact 
Develop categorycontact
 2013-07-17 08:41:02 -07:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
9c9b81c981 Merge pull request #1092 from atm-maxime/mko862 
Task 862 : ODT on shipment
 2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +02:00
Maxime Kohlhaas
9e5286bce9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-14 13:27:41 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Maxime Kohlhaas
3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:55:33 +02:00
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
BENKE Charles
45e32ca3a5 Update modFacture.class.php 
add 'accountancy_code_sell' to the customer invoice export list
 2013-07-05 12:14:27 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94 Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea New: Add box for graph of customer orders 2013-06-30 23:01:28 +02:00
Laurent Destailleur
314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
 2013-06-28 00:52:09 +02:00
Laurent Destailleur
dc22b5a50a Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2013-06-28 00:24:13 +02:00
Florian Henry
469e700895 Fix bug pgsql : add mail directly into mailling 2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84 Fix : bad element type name for company extrafields into export 2013-06-27 14:30:49 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a 
module according to some dynamic conditions.
 2013-06-24 18:31:56 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test 
this new module and debug it.
 2013-06-23 22:21:21 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
0b35217481 Start to debug/fix module IPP 2013-06-12 11:35:30 +02:00
Laurent Destailleur
0c9bc2ac5f Merge branch 'develop' of https://github.com/frederic34/dolibarr into 
frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2013-06-12 10:47:56 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
5a77828e62 New: Add object_hour as substitution tag for opendocument generation. 2013-06-08 18:12:32 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
c6c4a83850 Fix: Removed deprecated code fo local tax type 7 since we can use now 
the fiscal stamp that is a better implementation.
 2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
0ec32afd8d Fix: syntax error 
Fix: Bad field param
 2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844 Fix: Bad param used 2013-05-31 13:21:01 +02:00
simnandez
7fa0d6cffa Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
simnandez
4f9b5883df Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:18:24 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
BENKE Charles
aa06a0b113 Update modSociete.class.php 
enhance filter on export of contact
add postorfunction field in export of contact
 2013-05-28 15:37:08 +02:00
BENKE Charles
ed67173734 Update modFournisseur.class.php 
Add filter feature on the commande export
 2013-05-24 16:17:36 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Maxime Kohlhaas
57212d7db8 Add mobile phone in contact export 2013-05-17 17:29:41 +02:00
fhenry
faa2399b80 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog

Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
 2013-05-17 09:49:06 +02:00
Laurent Destailleur
b17fe9fc00 New: Export support now autosize of column for excel export. 
Fix: Bad charset when using script export-bank-receipts.
 2013-05-15 13:37:31 +02:00
Laurent Destailleur
f6dfcb756c Text cells must be left align into excel 2007 export. 2013-05-14 23:54:22 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
fhenry
f98442d700 Remove the option into admin screen 2013-05-14 09:24:05 +02:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Regis Houssin
8836b30a02 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:11 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-05-07 13:08:30 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works 
Add migration script 3.4 to 3.5
 2013-05-04 01:22:09 +02:00
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
880daa4375 Fix: log file permission during install 2013-05-03 11:51:26 +02:00
Laurent Destailleur
c17cd04686 Merge pull request #904 from defrance69/patch-5 
Update modSociete.class.php
 2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6 Merge pull request #903 from defrance69/patch-4 
Update modProduct.class.php
 2013-05-03 01:09:29 -07:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
BENKE Charles
b1784ff247 Update modSociete.class.php 
add filter feature on extrafields
 2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0 Update modProduct.class.php 
Add filtering feature on extrafields
 2013-04-30 13:12:54 +03:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Laurent Destailleur
0a282c018a Merge pull request #886 from jfefe/doc_ods 
Using of MAIN_DOC_USE_TIMING on ODT
 2013-04-26 13:04:08 -07:00
Laurent Destailleur
162cb4ffea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
jfefe
8835868749 Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3 Use MAIN_DOC_USE_TIMING on invoices (odt) 2013-04-26 08:48:44 +02:00
jfefe
036e81a089 Use MAIN_DOC_USE_TIMING on proposals (ODT) 2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING) 2013-04-26 08:48:43 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
41c8a9aa6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f Fix: finish merge 2013-04-24 12:44:36 +02:00
fhenry
bd1b440743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
fhenry
3fdc57cc56 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
Regis Houssin
ab4a3dcaa7 Fix: missing rename field 2013-04-22 10:18:03 +02:00
JF FERRY
642ba10d84 New hidden option to introduce timing value into odt document nam 2013-04-21 17:04:54 +02:00
JF FERRY
83028b958a Task #838 : retieve extension to work with ods document 2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20 Task #838 - change regex to look at ods document too 2013-04-21 14:55:32 +02:00
Laurent Destailleur
a7f169d102 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6 Fix: pgsql compatibility 2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246 Merge pull request #851 from FHenry/develop 
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
 2013-04-20 12:02:16 -07:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
Laurent Destailleur
08ae1d289b Pgsql compatibility 2013-04-19 15:02:53 +02:00
Laurent Destailleur
df0b0ebf51 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.
 2013-04-19 09:44:37 +02:00
Juanjo Menent
fa4490ef79 Merge pull request #840 from FHenry/develop 
[ task #741 ] Gestion des interventions/Add intervention box
 2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481 Qual: No need to use two menu entries for this. 2013-04-17 16:26:14 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Juanjo Menent
de19af9e9f Merge pull request #825 from FHenry/develop 
[ task #814 ] Add extrafield feature into Project/project tasks module
 2013-04-14 05:15:17 -07:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
 2013-04-14 09:40:01 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Laurent Destailleur
6e495bfbe1 Fix: lang loading 2013-04-13 14:38:26 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2 Add hook for substitution 2013-04-11 17:31:24 +02:00
fhenry
6335918d72 Quel : indentation 2013-04-11 17:06:53 +02:00
fhenry
2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
 2013-04-11 10:04:27 +02:00
Laurent Destailleur
792341a4b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-04-11 07:39:16 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656 Fix: filter on all contacts, not just those related to a company 2013-04-10 15:59:54 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88 Fix: security 2013-04-10 11:56:19 +02:00
Laurent Destailleur
538194f435 New: Add module opensurvey. Final. Test are welcome. 2013-04-09 23:05:50 +02:00
frederic34
61b4305949 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +02:00
frederic34
40f11206de Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/commande/fiche.php
 2013-04-08 11:33:45 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
fhenry
2b0668bf81 Add paiement mode et delay on PDF muscadet 2013-04-06 13:38:32 +02:00
fhenry
9ff559b033 Add wished delivery date into supplier orders PDF muscadet 2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05 Fix order_supplier and invoice_supplier PDF model name 2013-04-06 13:00:41 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Stephen L
cb3f183353 Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-03 00:57:40 +02:00
Laurent Destailleur
4c1f17f42f Qual: More robust error management for menu description 2013-03-30 19:11:52 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
97a90b0904 New: Add more ODT tags 2013-03-29 16:45:40 +01:00
Laurent Destailleur
4c47393b51 Fix: Add more ODT tags 2013-03-29 16:18:55 +01:00
Laurent Destailleur
2e3fd0083a Merge pull request #785 from FHenry/develop 
Add more information in ODT project template
 2013-03-28 15:40:46 -07:00
fhenry
c2be118efd Add more information in ODT project template 2013-03-28 20:51:00 +01:00
Laurent Destailleur
07062065e5 Merge pull request #782 from jfefe/propal_odt_choice 
New : can choose to generate the ODT document according to the status of a propale
 2013-03-27 13:35:34 -07:00
jfefe
1f537300ea Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status 2013-03-27 19:11:42 +01:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
fhenry
9507f4258b Add inforamtion on Project into ODT project 2013-03-26 23:32:22 +01:00
frederic34
1cd39df82b Merge remote-tracking branch 'upstream/develop' into develop 2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1 Print IPP 2013-03-26 10:23:00 +01:00
Laurent Destailleur
55a9d3abf1 Merge pull request #776 from FHenry/develop 
[ task #770 ] Add ODT document generation for Projects module
 2013-03-25 15:52:30 -07:00
fhenry
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
BENKE Charles
8b160ac712 Update modAgenda.class.php 
Add export feature of calendar module
 2013-03-25 18:26:35 +01:00
Laurent Destailleur
ff2407a454 Add hidden option to setup font size of information. 2013-03-24 14:01:33 +01:00
Laurent Destailleur
c3589e9785 Some debug into cron module: 
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
 2013-03-23 19:23:17 +01:00
Laurent Destailleur
9fe0d2cdd2 Fix: Removed a lors 'pre'. Also accurency of data must not be overwrite 
by odt template engine (to be compatible with all countries precision).
 2013-03-23 18:22:25 +01:00
Laurent Destailleur
73de8d169f Fix: Avoid call method on non object error 2013-03-23 18:04:46 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
bf912e2c78 Fix: Some bug into supplier pdf invoice setup. 2013-03-19 15:19:31 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop 
task #768  &  task #769
 2013-03-18 05:02:38 -07:00
Laurent Destailleur
c6b4259735 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
Grand Philippe
29b8ce1c2d try to fix: supplier invoice numbering 2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9 normalize 2013-03-17 14:40:49 +01:00
Grand Philippe
57d20e28fb normalize and simplify code 2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe try to fix : cannot display numbering models 2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Grand Philippe
86dff79b73 try to fix : cannot display numbering models 2013-03-16 16:58:45 +01:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-16 10:35:12 +01:00
fhenry
98cc7b7a2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-16 09:43:57 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
jfefe
65a9edd5a7 Fix : lang 2013-03-16 01:52:56 +01:00
jfefe
5f1141675c Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not. 2013-03-16 01:10:21 +01:00
Grand Philippe
7dbc782d42 prepair numbering models for supplier invoices 2013-03-15 19:03:07 +01:00
Grand Philippe
e46900ad84 prepair numbering models for supplier invoices 2013-03-15 18:40:31 +01:00
Grand Philippe
8f7c629d9c prepair numbering models for supplier invoices 2013-03-15 17:45:25 +01:00
Laurent Destailleur
7a152c8e0b Prepare code to be compatible when we will store localtax_type into 
lines.
 2013-03-15 17:29:18 +01:00
Laurent Destailleur
f522b18bdc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-15 17:14:06 +01:00
Laurent Destailleur
2ab28d974f Fix: Use better test to show localtax to avoid problem when switching 
from different country.
Perf: Can return all localtaxes in one call.
 2013-03-15 17:10:18 +01:00
Laurent Destailleur
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
Grand Philippe
a9eed57e27 prepair numbering models for supplier invoices 2013-03-15 16:43:28 +01:00
Grand Philippe
b0bce23595 prepair numbering models for supplier invoices 2013-03-15 16:16:38 +01:00
Grand Philippe
3c7c5f262f anglicization of comments 2013-03-15 16:03:03 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Laurent Destailleur
b0d7b33815 Merge pull request #715 from jfefe/extrafields 
[ task #746 ] add extrafields support on propal object
 2013-03-11 08:44:59 -07:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43 Fix: Usage of order into export broken when filters are used 2013-03-11 14:09:54 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865 Merge pull request #724 from KreizIT/develop 
Add trigger BILL_UNVALIDATE when invoice is unvalidate
 2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
00f4e6ad85 Fix: Force format text of excel text fields 2013-03-09 16:58:55 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
frederic34
16c5427366 Print IPP 2013-03-08 11:26:05 +01:00
Laurent Destailleur
c86f3ef4b4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-03-08 01:57:32 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1 Fix: Several problem with localtax into PDF generation 2013-03-07 12:04:12 +01:00
jfefe
fcd81e47eb Use price2num() function instead of price() to use calcul in ODT. 
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
 2013-03-07 03:43:23 +01:00
jfefe
289e2e7888 New function to fill ODT substitution array with extrafield of object 2013-03-07 03:27:28 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-07 01:48:27 +01:00
eldy
6c2841d4d6 New: Type of fields are received by export format handlers 2013-03-06 22:28:15 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +01:00
jfefe
04617d0eb3 Show extrafields for object into invoice ODT document 2013-03-06 05:33:00 +01:00
jfefe
7d3c35fb90 Merge branch 'extra_propal' into extrafields 2013-03-06 01:41:47 +01:00
Laurent Destailleur
c37e873ab4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
 2013-03-05 18:32:01 +01:00
jfefe
5ce11d00dd Display linked propal information into invoice ODT 2013-03-05 15:11:51 +01:00
JF FERRY
ff2a851ae8 Move substitution function for propal to common class & add extrafields display 2013-03-05 08:38:41 +01:00
Laurent Destailleur
b036120c70 Labels 2013-03-04 23:56:17 +01:00
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to 
display
 2013-03-04 11:16:46 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
Laurent Destailleur
7bbbda2dce New: dol_syslog method accept a suffix to use different log files for 
log.
 2013-02-28 16:19:16 +01:00
Laurent Destailleur
bdcb6bdef5 Try to aplpy enhancements defined into 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
 2013-02-26 20:15:20 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 07:38:55 -08:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
f862adc4d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 15:27:06 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Grand Philippe
a0df6764d8 english standardization 2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
Laurent Destailleur
8c4e13230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 14:20:46 +01:00
philippe
b4e43bbc41 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:58:19 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:02:15 +01:00
Regis Houssin
8a5f68de9c Fix: wrong hidden 2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
philippe
fae9f73ea4 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87 Fix: hide blocs with multi-page 2013-02-22 11:25:29 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
fhenry
3e42f90b1e Better to use foreach because when add mail in $cible array we can test 
with (!array_key_exists($obj->email, $cibles)) better than old method
 2013-02-19 04:48:39 +01:00
Laurent Destailleur
2ea62073b6 Merge pull request #660 from grandoc/develop 
fix : doesn't work with a /
 2013-02-16 14:14:30 -08:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Grand Philippe
7c47dedbce fix trad: begin change address instead of adresse 2013-02-15 17:33:07 +01:00
Laurent Destailleur
7260f39d21 New: Support tag total_vat_x.y for vat rate x.y into ODT templates 2013-02-15 17:06:32 +01:00
Laurent Destailleur
7d1c51ab77 Add option MAIN_PDF_TITLE_BACKGROUND_COLOR 2013-02-13 16:45:53 +01:00
Laurent Destailleur
f4c4a43f57 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-28 17:31:17 +01:00
Laurent Destailleur
ac3ccade98 Fix: number of chars to low to show value. 2013-01-28 13:11:12 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
f650888ea6 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d Fix: Bad error management 2013-01-18 12:09:39 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
6a51db82e9 Qual: We can enable box by default because a warning is output to user. 2013-01-15 15:53:35 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was 
not 1.
 2013-01-10 12:58:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
5c51905f63 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue 
2" instructions.
 2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3 
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
 2013-01-08 13:38:38 -08:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-08 08:46:48 +01:00
Laurent Destailleur
de83dc68e1 New: Uniformize odt generation to use hooks like pdf generation 2013-01-07 02:24:20 +01:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Laurent Destailleur
57742b347a Fix: Bad position of field with non A4 pages 2012-12-12 20:58:49 +01:00
Laurent Destailleur
77ca4241a5 New: Can input a payment back onto an credit note. 2012-12-09 18:39:42 +01:00
Laurent Destailleur
b119ab5539 Prepare 3.3 freeze. 2012-12-08 14:24:57 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes 
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
 2012-12-05 11:18:45 +01:00
Laurent Destailleur
b0b0f06655 Fix: Removed useless code 2012-12-03 20:23:16 +01:00
Regis Houssin
4388be7295 FIXME $ident is not defined 2012-12-03 17:16:04 +01:00
Laurent Destailleur
7d8c0837b6 Restore another lost commit. 2012-12-02 19:45:35 +01:00
Laurent Destailleur
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b remove unused arrays into pdf models (localtaxes) 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
 2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a show local taxes on crabe pdf model 2012-12-02 10:42:24 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Christophe Battarel
b70df3762c Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop 2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832 resolve conflict 2012-11-30 10:57:42 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Regis Houssin
d97f1937f8 Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!! 2012-11-29 10:25:33 +01:00
Laurent Destailleur
8212700c41 Fix: EOL 2012-11-28 19:25:12 +01:00
Laurent Destailleur
effe169850 Fix: pdf_getPDFFontSize must be after pdf_getInstance 2012-11-28 19:19:39 +01:00
Christophe Battarel
e459736977 add function gettypeoflocaltax and modify pdf models 2012-11-28 17:47:15 +01:00
Christophe Battarel
f0918a2536 remove unused arrays into pdf models (localtaxes) 2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4 show local taxes on crabe pdf model 2012-11-28 12:11:42 +01:00
Christophe Battarel
b9cdde88c7 show localtaxes on einstein pdf model 2012-11-28 10:43:21 +01:00
Christophe Battarel
f00b4b5527 correction to allow global local tax (type 7) on localtax1 2012-11-28 10:24:40 +01:00
Christophe Battarel
203a03c4d1 show local taxes on pdf propale azur model 2012-11-27 15:56:45 +01:00
Laurent Destailleur
59a305f6f1 New: no dash line if last item. 2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5 New: Add option to add slashes lines between lines into PDF. 2012-11-21 19:07:03 +01:00
Laurent Destailleur
d9cdb542d5 Debug filter during export 2012-11-20 14:07:52 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
2e8e1f759f New: Add warning when we try to load sql from an not existing dir 2012-11-16 13:25:49 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
768e719961 Fix: firstname was missing 2012-11-14 18:32:52 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
5e583b65f2 Doxygen 2012-11-14 01:35:39 +01:00
Laurent Destailleur
06c77576b7 New: Maxi debug on feature to filter lines on export. Removed a lot of 
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
 2012-11-14 00:27:25 +01:00
Laurent Destailleur
66755fb166 Fix: Avoid confusion between method getXXX into parent class with 
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
 2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134 Doxygen 2012-11-11 17:50:24 +01:00
Laurent Destailleur
7d01ea7fc3 Fix: Do not break dolibarr usage if log fails 2012-11-06 19:42:03 +01:00
Laurent Destailleur
8896803921 New: We can use a dynamic value ($conf->global->XXX for example) into 
titles of menus.
New: Can choose menu entry to show with external site module.
 2012-11-04 21:19:12 +01:00
Laurent Destailleur
19c617e4a0 Fix: Solve double ";;" 2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0 Fix: Not enought space for free text. To avoid to edit again and again 
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
 2012-11-03 13:32:37 +01:00
Laurent Destailleur
f8a9733b73 Again 2 pixels missings 2012-11-03 00:37:10 +01:00
Laurent Destailleur
5f3ceb0081 Fix: Label for payment by cheque using the wrong translation key 
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
 2012-11-02 15:41:09 +01:00
Laurent Destailleur
fd7aea9779 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6 Fix: Bad detection of space left 2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377 Merge pull request #469 from camlafit/develop 
Return Human readable date product
 2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7 Fix: Error management 2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd Qual: Uniformize PDF code 2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063 Merge all substitutions on same loop (Invoicing with odt) 
* It's not necessary to have a redondant loop to substitute all variables
 2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569 Return Human readable date product 
* By default date with mktime format, not great on Invoice
 2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, 
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
 2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e Fix: Avoid warnings 2012-10-31 12:35:52 +01:00
Maxime Kohlhaas
240d310a7f Fix : shipment PDF rouget wasn't using the right var to access related internal contact 2012-10-31 08:57:56 +01:00
Laurent Destailleur
64d8d558a5 Qual: Uniformize pdf code 2012-10-31 02:29:45 +01:00
Laurent Destailleur
42d2a0a2d1 Fix: Bad position of columns. Works with all paper format now. 2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0 Qual: Some changes to use more efficiently bottom of page when there is 
several pages (we don't keep space for total on all pages, but only last
one)
 2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7 Qual: Removed duplicate template (nearly no difference between sirroco 
and typhon, so no need to keep them both).
 2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925 Fix: The bottom margin is already included into heightforfooter 
This provide 1cm more for product description.
 2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55 Fix: Free text overlap data when not on last page. 2012-10-30 13:11:17 +01:00
Laurent Destailleur
e013fa01a7 Fix: Revert direction of option (this information is a legal issue for 
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
 2012-10-29 11:38:32 +01:00
Laurent Destailleur
9d4471dd67 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
 2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be Fix: Better fix for import when field is computed by a function 2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Laurent Destailleur
ee29c65708 Move stock import into stock module (stock module is at a low level than 
product)
 2012-10-27 20:27:07 +02:00
Christophe Battarel
253e3412db fix wrong insert sql construction 
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
 2012-10-27 12:55:28 +02:00
simnandez
9ada60afbc New: More import options. Products categories 2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66 New: More import options. Products categories 2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83 New: More import options. Products categories 2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c New: More import options. Customer and suppliers categories 2012-10-26 18:34:49 +02:00
simnandez
425ebae802 New: More import options. Products categories 2012-10-26 18:19:04 +02:00
simnandez
7aec227694 New: More import options. Products stocks 2012-10-26 17:52:53 +02:00
simnandez
970933ec7f Fix: [ bug #579 ] Multi-Company and imports 2012-10-26 17:29:41 +02:00
Regis Houssin
c521a77e92 New: add key generator in webservices admin page 2012-10-26 15:20:47 +02:00
Regis Houssin
b5d70ad17f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c Fix: Bad ProfId assignation in imports 2012-10-25 17:08:25 +02:00
Laurent Destailleur
daeb1029a1 New: Support field required or not 2012-10-25 13:11:55 +02:00
Regis Houssin
9d95e8bffb Fix: missing hookmanager 2012-10-25 11:44:04 +02:00
Regis Houssin
f8f1d3a0df Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement 
mode and paiement method in pdf
 2012-10-25 09:24:05 +02:00
Regis Houssin
23707e2346 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0 Fix: strict mode 2012-10-24 22:50:19 +02:00
Laurent Destailleur
d1a4a6a090 New: Support synchro of field job/title. 
New: Add script to synchronize users from ldap to dolibarr.
 2012-10-24 21:19:10 +02:00
Laurent Destailleur
eaad5f075e Fix: Some fix to removed refused controls by distrib package build 
systems.
 2012-10-22 13:08:55 +02:00
Laurent Destailleur
d56791d4dc Fix: Works with PHP 5.2 2012-10-22 00:43:59 +02:00
Laurent Destailleur
bba5057d5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7 Fix: PDF works with US executive format. 2012-10-21 15:50:53 +02:00
simnandez
aa53b7a2ba New: More import options. Thirds Bank Accounts 2012-10-19 13:00:53 +02:00
Laurent Destailleur
0152e226c1 Fix: Use correct translation of fields 2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8 Merge pull request #453 from simnandez/develop 
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
 2012-10-18 03:31:55 -07:00