Laurent Destailleur
3ecb9c2dd8
Merge pull request #1130 from FHenry/3.4
...
Avoid php warning if extrafield "list from table" have bad settings
2013-07-25 13:40:09 -07:00
Laurent Destailleur
fe079f71da
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-07-25 21:53:38 +02:00
Florian Henry
2f112efad5
Avoid php warning if extrafield list from table have bad settings
2013-07-25 20:18:45 +02:00
Laurent Destailleur
16d530b22d
Fix: Watermark make pagebreak crazy.
2013-07-25 18:58:47 +02:00
Laurent Destailleur
58da76292f
Fix: Watermark make pagebreak crazy.
2013-07-25 18:56:09 +02:00
Laurent Destailleur
acd92f078b
Fix: Translation
2013-07-25 15:28:01 +02:00
Laurent Destailleur
186d5ccad1
Uniformize code and look and file for shipment statistics page. This
...
remove a TODO and clean code.
2013-07-25 15:02:40 +02:00
Laurent Destailleur
9c88c03860
Fix: missing css class on tr
2013-07-25 13:56:07 +02:00
Laurent Destailleur
351d12bb0a
Duplicate translation key
2013-07-25 10:20:41 +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
Juanjo Menent
9babb6cc4a
Merge pull request #1129 from FHenry/3.4
...
Fix bug export contact extrafields
2013-07-24 06:18:00 -07:00
Laurent Destailleur
7cf429d238
Fix: Color change on page break.
2013-07-24 15:04:09 +02:00
Laurent Destailleur
cc83ad0b0e
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-24 14:15:35 +02:00
Florian Henry
f11d477770
Fix bug export contact extrafields
2013-07-24 13:28:02 +02:00
Laurent Destailleur
2f2f2b66c4
Fix: creation of thumbs not working
2013-07-24 11:26:09 +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
Laurent Destailleur
644f5149e4
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-07-24 00:42:28 +02:00
Laurent Destailleur
68d83dd653
Some fix into perf.php page.
2013-07-24 00:34:08 +02:00
Laurent Destailleur
15c4c5d6b9
Some fixes into css
2013-07-23 20:48:37 +02:00
Laurent Destailleur
74ce3fe738
Fix: rowspan
2013-07-23 19:48:21 +02:00
Laurent Destailleur
30cd4aeced
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-23 18:37:09 +02:00
Laurent Destailleur
71634a0c76
Fix: Add missing css style
2013-07-23 18:36:18 +02:00
Laurent Destailleur
1df17b1295
Merge pull request #1126 from csalvador/marginfix
...
Marginfix
2013-07-23 09:33:03 -07:00
Laurent Destailleur
91debb5b82
Merge pull request #1125 from csalvador/formfile
...
added permission to the hook parameters to make it easier to check
2013-07-23 09:32:12 -07:00
Laurent Destailleur
9ee7cd477f
Merge pull request #1124 from csalvador/holidayfix
...
fixed fr translation
2013-07-23 09:31:36 -07:00
Laurent Destailleur
df27538d74
Merge pull request #1122 from FHenry/3.4
...
Avoid PHP warning
2013-07-23 09:31:16 -07:00
Laurent Destailleur
1d81d1f42c
Merge pull request #1120 from defrance69/patch-7
...
Update modBanque.class.php
2013-07-23 09:30:53 -07:00
Laurent Destailleur
fb0791e9d9
Merge pull request #1119 from defrance69/patch-6
...
Update element.php
2013-07-23 09:28:44 -07:00
Laurent Destailleur
1596619f2d
Merge pull request #1118 from csalvador/bugfix
...
instanciation of Facture objects raised errors, deleted them
2013-07-23 09:27:56 -07:00
Laurent Destailleur
ac2ba9d1f6
Merge pull request #1117 from atm-maxime/mko149
...
Task 149 : # of files and notes appears in tab
2013-07-23 09:26:59 -07:00
Laurent Destailleur
8f39d30ea5
Fix: Bad parameter
2013-07-23 18:22:10 +02:00
Cédric Salvador
8cf90c38a7
fixed fr translation
2013-07-23 16:29:46 +02:00
Cédric Salvador
35faff04e9
fix pdf model import
2013-07-23 15:59:41 +02:00
Florian Henry
6f262b3a5b
Avoid PHP warning
2013-07-23 15:52:41 +02:00
Laurent Destailleur
cbeeb463e2
Fix: Missing tr line
2013-07-23 15:26:35 +02:00
Laurent Destailleur
361f3a638a
Fix: W3C
2013-07-23 15:24:34 +02:00
Cédric Salvador
28247f37ae
corrected filter in form_thirdparty call
2013-07-23 15:15:01 +02:00
Cédric Salvador
b04e90c75d
added fields to group-by statements so it stops raising errors in strict mode
2013-07-23 15:05:35 +02:00
Cédric Salvador
7bd7c5206d
added permission to the hook parameters to make it easier to check
2013-07-23 11:05:46 +02:00
BENKE Charles
8c7c3f03d3
Update modBanque.class.php
...
Add bordereau ref_ext fields on export
2013-07-23 05:54:47 +02:00
BENKE Charles
6ffaefc002
Update element.php
...
Display of project element limited by user rights
2013-07-23 05:49:30 +02:00
Laurent Destailleur
2e7205f309
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-23 01:58:01 +02:00
Laurent Destailleur
e80583bfb7
Fix: W3C
2013-07-23 01:56:14 +02:00
Cédric Salvador
19dc3ef8da
instanciation of Facture objects raised errors, deleted them
2013-07-22 11:51:29 +02:00
Juanjo Menent
e939a4d268
Merge pull request #1116 from FHenry/develop
...
Add category contact into left menu entry
2013-07-22 02:17:52 -07:00
lalaina rasamoelina
4ecc9b30a9
Delete the name of user who are disable in the creation of events
2013-07-22 11:17:45 +02:00
Florian Henry
26894d9749
Fix bug in SQL
2013-07-22 10:17:31 +02:00
Florian Henry
bbacef6815
Add category contact into left menu entry for augeria theme
2013-07-22 10:15:48 +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
Juanjo Menent
fbdb764d41
Merge pull request #1113 from atm-maxime/develop
...
Work on shipment
2013-07-22 00:02:56 -07:00
Florian Henry
1a8377d847
Add category contact into left menu entry
2013-07-21 10:47:55 +02:00
BENKE Charles
c555c17315
Update modBanque.class.php
...
Add Export of check deposit / bill
2013-07-20 23:47:37 +02:00
Maxime Kohlhaas
da3e711be7
Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project
2013-07-20 10:54:38 +02:00
Maxime Kohlhaas
28eb9d07b2
Task 149 : add # of notes and doc in tab + have always last 3 tabs be notes, doc and info
2013-07-20 09:07:10 +02:00
Laurent Destailleur
22b8fcfe63
Style
2013-07-19 18:01:49 +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
Maxime Kohlhaas
00aded09bb
Fix : shipment prices not related to qty shipped
2013-07-19 17:27:08 +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
Maxime Kohlhaas
fc8805f2ca
Added missing trad on shipment + display calculated weight after true weight
2013-07-19 16:52:58 +02:00
Laurent Destailleur
7aa5daaeaf
Merge pull request #1110 from GPCsolutions/noerrorsondocuments
...
Avoid printing errors on documents that are fine without
2013-07-19 07:41:51 -07:00
Laurent Destailleur
ad783cc4f1
Merge pull request #1112 from PaulPoulain/949-develop
...
949 Put the ref_client in the subject mail
2013-07-19 06:59:49 -07:00
Laurent Destailleur
9e283f98e8
Fix: removed deprecated nowrap tag
...
Add changelog entry
2013-07-19 15:58:07 +02:00
Laurent Destailleur
11f339eca4
Merge pull request #1111 from PaulPoulain/956-develop
...
956 - Possibility to edit the ref_client when we want
2013-07-19 06:54:24 -07:00
Laurent Destailleur
91b51f1f58
Fix: Some td cells must not have hover styles.
2013-07-19 15:52:49 +02:00
Laurent Destailleur
ed52dd9636
New: A more responsive desgin for statistic box of home page
...
Qual: Hook for statistics now match specifications.
2013-07-19 15:29:40 +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
e3b38cf3bb
Fix: SQL Syntax error.
...
Fix: A ref_ext can not be NOT NULL.
New: Add tms field into table llx_bordereau_cheque.
2013-07-19 14:09:17 +02:00
Laurent Destailleur
09fd904e76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/ecm/index.php
2013-07-19 14:01:47 +02:00
Laurent Destailleur
83b5c193f7
Fix: move search_ville into search_town (search_ville no more used into
...
3.5).
2013-07-19 14:00:08 +02:00
Laurent Destailleur
2814aeec1d
Merge pull request #1109 from PaulPoulain/930-develop
...
Put the town in the list of propal
2013-07-19 04:53:51 -07:00
Maxime Kohlhaas
9d8438ecdd
Minor fix on remisecheque display
2013-07-19 13:39:01 +02:00
Laurent Destailleur
3896cde299
Removed useless method. Prefer using generic method.
2013-07-19 13:38:57 +02:00
Laurent Destailleur
4d2c80a122
Merge pull request #1107 from atm-maxime/develop
...
Add possibility to define dependencies between extra fields lists
2013-07-19 04:16:27 -07:00
Laurent Destailleur
e06752bc0e
Merge pull request #1105 from atm-maxime/mko149
...
Task 149 : # of files and notes appears in tab
2013-07-19 04:14:05 -07:00
Maxime Kohlhaas
196bce7e11
Add link to RemiseCheque in account lines
2013-07-19 10:23:08 +02:00
Maxime Kohlhaas
efff92fe1c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb
Start work on bank sharing for multi-company
2013-07-19 09:19:20 +02:00
Maxime Kohlhaas
4aa9d92a49
Display CheckReceipt on Payment card if exists
2013-07-19 09:17:54 +02:00
Maxime Kohlhaas
7abc53698a
Add RefExt field on RemiseCheque
2013-07-19 08:54:11 +02:00
Laurent Destailleur
306f6dd839
Updrage to tcpdf 6.0.021
2013-07-19 00:14:30 +02:00
Laurent Destailleur
c943ef8edb
Fix: doxygen
2013-07-18 23:39:29 +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
a240dba290
Fix: Translation of text
2013-07-18 19:01:19 +02:00
Maxime Kohlhaas
aff2be1bc0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-18 17:50:51 +02:00
Maxime Kohlhaas
9d2489f022
Add help on extrafields lists dependencies
2013-07-18 17:49:47 +02:00
Maxime Kohlhaas
63e6cf5c81
Add possibility to define dependencies between extra lists
2013-07-18 17:42:09 +02:00
Juanjo Menent
e89938d66e
Merge pull request #1106 from atm-maxime/develop
...
Add Maghreb regions and departments
2013-07-18 08:06:32 -07:00
Juanjo Menent
4c4d11585e
Merge pull request #1104 from FHenry/develop_T165
...
[ task #165 ] Add export of multiprices
2013-07-18 08:02:21 -07:00
Laurent Destailleur
75214a6b70
New: Add graphical box for turnover and proposal
2013-07-18 16:53:31 +02:00
Geoffrey
efacfc9aa3
Add Maghreb regions and departments
2013-07-18 16:49:56 +02:00
Laurent Destailleur
d5ca2f9f40
Fix: forged select for stats where wrong when filtering on a thirdparty
...
Conflicts:
htdocs/compta/facture/class/facturestats.class.php
2013-07-18 15:37:14 +02:00
Laurent Destailleur
1b70ecdb26
Fix: forged select for stats where wrong when filtering on a thirdparty
2013-07-18 15:25:25 +02:00
lalaina rasamoelina
913f4d94cc
Put the ref_client in the subject mail
2013-07-18 12:39:50 +02:00
Maxime Kohlhaas
e0d037dae5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149
2013-07-18 11:06:38 +02:00
lalaina rasamoelina
3dac43f27a
Possibility to edit the ref_client when we want
2013-07-18 11:05:50 +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
lalaina rasamoelina
29094c9623
Put the town in the list of propal
2013-07-18 09:20:18 +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
Laurent Destailleur
df88dc2f23
Use a better variable name
2013-07-17 14:57:20 +02:00
Maxime Kohlhaas
1c4c3285e2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149
2013-07-17 10:11:54 +02:00
Juanjo Menent
8bae6a774d
Merge pull request #1095 from atm-maxime/develop
...
Fix on turnover reports
2013-07-16 23:47:56 -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
5329312dd3
Add table
2013-07-16 21:26:19 +02:00
Florian Henry
c518aa1019
Add translation
2013-07-16 21:11:06 +02:00
Florian Henry
e07eac9b17
[ task #519 ] Add category association with contacts
2013-07-16 21:04:58 +02:00
Maxime Kohlhaas
a6a058ddae
Fix by including lib files
2013-07-16 18:45:40 +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
efd855b186
Can replace a tag with file into parameter to ouput into list of files.
2013-07-16 17:50:12 +02:00
Maxime Kohlhaas
029394aa3f
Fix : linked object not deleted when deleting a supplier invoice
2013-07-16 16:34:06 +02:00
Maxime Kohlhaas
c0feda4921
Task 149 : added on product
2013-07-16 01:28:24 +02:00
Maxime Kohlhaas
aa8e43cd1b
Task 149 : Add number of notes and attached files into tab. Started with thirdparty
2013-07-16 01:09:19 +02:00
Maxime Kohlhaas
7b5386692c
Added w/o VAT on turnover report
2013-07-16 00:30:44 +02:00
Maxime Kohlhaas
bc0a52fa71
Fix : link to invoice list + SQL was bad when several invoices had the same amount on the same thirdparty
2013-07-16 00:29:03 +02:00
Maxime Kohlhaas
c7f3778b90
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-16 00:21:06 +02:00
Laurent Destailleur
2ae1e787c9
Fix: Bad date ranges
...
Conflicts:
scripts/invoices/rebuild_merge_pdf.php
2013-07-15 21:49:54 +02:00
Laurent Destailleur
e2b63bb8dd
Fix: Bad date ranges
2013-07-15 21:47:45 +02:00
Laurent Destailleur
28c28bd217
New: Add option excludethirdparties and onlythirdparties into merge pdf
...
scripts.
2013-07-15 20:56:43 +02:00
Laurent Destailleur
dd10ff8a11
eol
2013-07-15 18:51:56 +02:00
Laurent Destailleur
9e9e5224f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-15 18:45:23 +02:00
Laurent Destailleur
17f3d98fb3
New: Add option to exclude some thirdparties
2013-07-15 18:44:59 +02:00
Florian Henry
d09af2b18e
Better use of reopen method
2013-07-15 09:37:55 +02:00
Florian Henry
9d0fe3c1da
Use reopen method to repoen proposal and fire trigger PROPAL_REOPEN
2013-07-15 09:33:26 +02:00
Laurent Destailleur
d637212dce
Fix: alternative url were sometimes relative to server, sometimes to
...
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
2013-07-15 00:58:40 +02:00
Laurent Destailleur
254f46752e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-15 00:41:46 +02:00
Laurent Destailleur
08f8acc867
More complete example
2013-07-15 00:41:27 +02:00
Laurent Destailleur
5fb707f918
Fix: Restore disappeared feature
2013-07-14 21:02:00 +02:00
Laurent Destailleur
446cc162cd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/compta/facture/impayees.php
2013-07-14 20:33:54 +02:00
Laurent Destailleur
c24659b3a5
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-07-14 20:29:25 +02:00
Laurent Destailleur
dc5ad1a0f3
Fix: Total missing
2013-07-14 20:29:07 +02:00
Laurent Destailleur
f4dfac045a
Fix: Bad default mysql driver
2013-07-14 20:20:52 +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
Maxime Kohlhaas
4fd1b5364e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-14 13:25:20 +02:00
Laurent Destailleur
0a3bd58645
Fix: Duplicate button
2013-07-14 03:28:19 +02:00
Laurent Destailleur
a1e7663614
eol
2013-07-14 01:49:43 +02:00
Laurent Destailleur
89d8eb19c0
Fix: navigation fails
2013-07-14 01:29:26 +02:00
Laurent Destailleur
ada3df4245
eol
2013-07-14 01:21:00 +02:00
Laurent Destailleur
94e3277516
Fix: Navigation after using numbering for supplier ref.
2013-07-14 01:19:05 +02:00
Laurent Destailleur
57ab24baca
Fix: bad sort order into ecm module
2013-07-14 01:10:23 +02:00
Laurent Destailleur
154cd1fcf9
Fix: Sort on ref for supplier invoice into ged
2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c
Fix: automatic ecm for supplier invoices
2013-07-14 01:10:11 +02:00
Laurent Destailleur
8a8e55ffd3
Fix: bad sort order into ecm module
2013-07-14 01:08:53 +02:00
Laurent Destailleur
1e6171ad0e
Fix: Sort on ref for supplier invoice into ged
2013-07-14 00:40:22 +02:00
Laurent Destailleur
bbe9778ced
Fix: automatic ecm for supplier invoices
2013-07-14 00:09:42 +02:00
Laurent Destailleur
4608e07753
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/bank/account.php
2013-07-13 23:41:32 +02:00
Laurent Destailleur
55d14f430c
Fix: Search on supplier ref
2013-07-13 23:36:21 +02:00
Laurent Destailleur
3a9ffb19c3
fix: eol
2013-07-13 21:14:05 +02:00
Laurent Destailleur
7cdc7c0ab2
Fix: Typo
2013-07-13 19:41:27 +02:00
Laurent Destailleur
73a33a6dae
Fix: Bug to delete bank line
2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35
Fix: Missing user param
2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f
Fix: Bug to delete bank line
2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235
Fix: Missing label
2013-07-13 17:25:10 +02:00
Laurent Destailleur
3f94950b0e
Fix: Clean supplier ref
2013-07-13 16:54:17 +02:00
Laurent Destailleur
330d2173be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-13 15:37:30 +02:00
Maxime Kohlhaas
6c79247a4b
Merge
2013-07-13 11:44:25 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Maxime Kohlhaas
0d1ab71b05
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-13 10:18:51 +02:00
Laurent Destailleur
f009100126
Fix: Bad column
2013-07-12 16:51:31 +02:00
Laurent Destailleur
ad8904a4fb
Can add a picto onto line of files list.
2013-07-12 15:10:32 +02:00
Laurent Destailleur
84447fec35
More complete examples
2013-07-12 10:57:49 +02:00
Laurent Destailleur
7cff7d3250
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-11 20:22:21 +02:00
Laurent Destailleur
2c0a01fc8c
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
0d40debeac
Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 17:17:43 +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
Geoffrey
54961036be
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 15:40:10 +02:00
Laurent Destailleur
7485192cfb
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-11 11:56:57 +02:00
Laurent Destailleur
158a2b8ca8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/.gitignore
2013-07-11 11:52:32 +02:00
simnandez
442ca8ea35
Trad: Fix ca_ES and es_ES missing translation
2013-07-11 11:51:13 +02:00
simnandez
11bf611618
Trad: Fix ca_ES and es_ES missing translation
2013-07-11 11:50:31 +02:00
Laurent Destailleur
807cbe4163
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-11 09:43:07 +02:00
Laurent Destailleur
548ea4f93f
Fix: Navigation
2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b
Fix: Navigation
2013-07-10 23:57:18 +02:00
Laurent Destailleur
c174be7100
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8
Fix: Avoid duplicate div error.
2013-07-10 22:58:53 +02:00
Laurent Destailleur
29759a1cba
Protect to avoid commiting into main source
2013-07-10 17:36:56 +02:00
Laurent Destailleur
40d7eca4bc
Protect to avoid commiting into main source
2013-07-10 17:36:14 +02:00
Laurent Destailleur
27a435994a
Qual: Some methods object->addline used a first parameter that was
...
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
1ee67bd5b9
Prepare code to uniformize method addline.
2013-07-10 16:07:57 +02:00
Maxime Kohlhaas
9d931b7b05
Task # 862 : ODT templates on shipment
2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a
Just use print instead of echo, just because echo is not use anuwhere
...
else.
2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d
Merge
2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612
Merge pull request #1085 from csalvador/form_attach_new_file_hook
...
hook in form_attach_new_file(html.formfile.class.php)
2013-07-10 06:42:37 -07:00
Laurent Destailleur
f2281a4e58
Merge pull request #1086 from FHenry/3.4
...
remove pgsql warning on date insert
2013-07-10 06:40:31 -07:00
Maxime Kohlhaas
8f72e16444
Remove duplicate code
2013-07-10 15:34:36 +02:00
simnandez
ca406d0980
Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS
2013-07-10 15:34:16 +02:00
simnandez
50395fc8c4
Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS
2013-07-10 15:32:29 +02:00
Cédric Salvador
9619b09e37
rewriting to fit the new way to use hooks
2013-07-10 15:30:49 +02:00
Laurent Destailleur
a4abfe1abc
New: Can add an event automatically when a projet is create.
2013-07-10 14:46:16 +02:00
Florian Henry
729cef3eb4
Qual: Return id of order creates instead of 1 with method
...
createFromProposal
2013-07-10 13:32:42 +02:00
Florian Henry
44cd024f89
Fix bug on from_confrim using ajax and radio button question type
2013-07-10 13:10:32 +02:00
Florian Henry
b9bfccd0e2
fix pgsql warning date
2013-07-10 10:35:10 +02:00
Laurent Destailleur
a60cc916f6
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-07-10 10:34:56 +02:00
Florian Henry
4aa966f7ad
remove pgsql warning on date insert
2013-07-10 10:30:33 +02:00
Laurent Destailleur
f94f516a12
Clean code for managing alternate root dirs.
2013-07-09 23:46:31 +02:00
Laurent Destailleur
fbf6f150bc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-09 21:41:05 +02:00
Laurent Destailleur
f67e52f42a
Start to clean hook code
2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28
Start to clean hookmanager code.
2013-07-09 21:33:45 +02:00
Laurent Destailleur
752bc0ccff
Work on tool for performance advice.
2013-07-09 18:45:14 +02:00
Cédric Salvador
03ad72a1fa
fix dol_buildpath failing when processing path such as file.php?id=__ID__
2013-07-09 18:14:50 +02:00
Cédric Salvador
2fc07d05e9
hook in form_attach_new_file(html.formfile.class.php)
2013-07-09 18:12:43 +02:00
Laurent Destailleur
f4428c8a8a
Fix: Bad link
2013-07-09 15:27:06 +02:00
Laurent Destailleur
0ca4e4ffe8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-09 13:51:27 +02:00
Laurent Destailleur
5706779c8b
New: Add a page on performance advice
2013-07-09 13:50:20 +02:00
Laurent Destailleur
0b28ab9dde
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-07-09 00:36:12 +02:00
Laurent Destailleur
aa628fb47a
Fix help
2013-07-09 00:35:55 +02:00
Laurent Destailleur
c1cb5e9bff
Fix geoipmaxmind module
2013-07-09 00:19:58 +02:00
Florian Henry
3db195cb48
[ bug #971 ] html.form.class.php select_contact with autocomplete do not
...
exclude id from exclude array
2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3
[ bug #972 ] Auto completion contact field do not take account the min
...
caract number before search
2013-07-08 12:47:07 +02:00
Laurent Destailleur
b26250c45a
Fix when alt path is full url instead of relative.
2013-07-07 23:37:56 +02:00
Laurent Destailleur
8f71e5fda2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2013-07-07 23:25:03 +02:00
Laurent Destailleur
05461c47cc
Fix: vat rate for slovenia
2013-07-07 23:22:00 +02:00
Laurent Destailleur
0de1fe893a
Prepare 3.4
2013-07-07 13:30:30 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61
Qual: Remove tons of codesniffer errors and warnings.
2013-07-07 13:14:32 +02:00
Laurent Destailleur
cbc0570bc3
Update exemple
2013-07-07 03:33:10 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
9be6dd8b17
Fix: Missing load
2013-07-05 23:10:47 +02:00
Laurent Destailleur
5385d87995
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/ca_ES/errors.lang
htdocs/langs/ca_ES/main.lang
htdocs/langs/ca_ES/opensurvey.lang
htdocs/langs/ca_ES/paybox.lang
htdocs/langs/ca_ES/products.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/errors.lang
htdocs/langs/es_ES/main.lang
htdocs/langs/es_ES/products.lang
2013-07-05 21:56:54 +02:00
Laurent Destailleur
1252820481
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-05 21:18:00 +02:00
Laurent Destailleur
e7982120df
Fix bug with php 5.2.4
2013-07-05 21:17:35 +02:00
Laurent Destailleur
879cfbbdf3
Merge pull request #1080 from defrance69/patch-4
...
Update modFacture.class.php
2013-07-05 05:59:19 -07:00
Laurent Destailleur
2cdf621b75
New: Provide relativepath as parameter
2013-07-05 14:55:24 +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
Laurent Destailleur
529a58cc9d
New: Add advice into info help
2013-07-05 12:04:55 +02:00
Florian Henry
1e089ef74a
Reset demo webservice to NORUN
2013-07-05 09:19:56 +02:00
Laurent Destailleur
7cb8809669
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-04 00:12:23 +02:00
Laurent Destailleur
eef039e02f
New: [ task #286 ] Enhance rounding function of prices to allow round of
...
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
simnandez
c474929caa
Trad: Load contracts lang for stats panel
2013-07-03 16:51:06 +02:00
simnandez
df26037e9d
Trad: Load contracts lang for stats panel
2013-07-03 16:49:54 +02:00
simnandez
66ce0582a1
Trad: Fix missing = into es_ES admin.lang
2013-07-03 16:42:53 +02:00
Regis Houssin
7e70d935b6
Fix: change for use url of image
2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb
Fix: change for use url of image
2013-07-03 16:06:42 +02:00
BENKE Charles
94772dbe30
Update fiche.php
...
change restricted area, too much agressive
2013-07-03 15:25:22 +02:00
simnandez
6180b6c0a6
Fix: Amarok Tab visu.
2013-07-03 12:16:32 +02:00
simnandez
64a04ef150
Trad: Add missing trans before 3.4 final release
2013-07-03 12:14:37 +02:00
Laurent Destailleur
33ed654745
New: Upgrade jquery flot library to 0.8.1
2013-07-03 03:40:59 +02:00
Laurent Destailleur
d96719c948
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-02 21:55:41 +02:00
Laurent Destailleur
6f5a918373
New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
...
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
simnandez
c9fd070bba
Fix: Amarok Tab visu.
2013-07-02 18:53:42 +02:00
Laurent Destailleur
8d7a058a67
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-07-02 09:59:04 +02:00
Laurent Destailleur
1beb50e870
Fix: State for turkey
2013-07-02 09:58:09 +02:00
Laurent Destailleur
46c3b1eb1f
Missing vat rate
2013-07-02 01:26:52 +02:00
Laurent Destailleur
cb68924f34
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-07-02 01:10:06 +02:00
Laurent Destailleur
443d6d4405
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-07-01 22:44:53 +02:00
Laurent Destailleur
154daa0657
Fix: css
2013-07-01 21:52:09 +02:00
Raphaël Doursenaud
a4fe6a40bf
Fixed missing class include
2013-07-01 17:45:44 +02:00
Cédric Salvador
edc5de4f24
indentation
2013-07-01 15:42:14 +02:00
Cédric Salvador
96cea7b79a
add the libname field in the migration script
...
Conflicts:
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
2013-07-01 15:42:14 +02:00
Cédric Salvador
aa4f2ba8fb
made it possible to call a function from a library
...
Conflicts:
htdocs/install/mysql/tables/llx_cronjob.sql
scripts/cron/cron_run_jobs.php
2013-07-01 15:41:27 +02:00
Laurent Destailleur
65c14e9fd9
Add missing turkish file
2013-07-01 14:48:30 +02:00
Laurent Destailleur
b43ba84adb
Update tr_Tr language files
2013-07-01 13:57:36 +02:00
Laurent Destailleur
4d71761359
Merge pull request #1074 from GPCsolutions/develop
...
Normalized EOL
2013-07-01 03:47:49 -07:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
17ed70230e
Bad request
2013-07-01 11:45:09 +02:00
Laurent Destailleur
56676c925f
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-01 02:10:57 +02:00
Laurent Destailleur
59c97afeed
Fix: Bad calculation. Missing global.
2013-07-01 02:10:22 +02:00
Laurent Destailleur
c37527a8a0
Fix: No currency into lists.
2013-07-01 01:59:07 +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
1c80f35080
Fix: Avoid duplicate of old lines
2013-06-30 22:19:36 +02:00
Laurent Destailleur
f12680e7c4
Save page with some test and prototypes.
2013-06-30 22:11:25 +02:00
Laurent Destailleur
606b60b17c
Minor fixes into css
2013-06-29 04:01:54 +02:00
Laurent Destailleur
4b00da5fa8
Work on boxes with graph
2013-06-29 02:23:23 +02:00
Laurent Destailleur
d8883dba7f
New: Add new graphical boxes (customer invoices per month).
2013-06-28 19:19:18 +02:00
Laurent Destailleur
4f84b1e774
Fix: Bad error management
2013-06-28 17:55:48 +02:00
Laurent Destailleur
1168a43bfe
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-28 17:54:23 +02:00
Laurent Destailleur
ee8f3cbbe5
Fix: css when using checkbox into label
2013-06-28 17:50:10 +02:00
Laurent Destailleur
1afef513b1
Fix: Bad error management
2013-06-28 17:44:34 +02:00
Laurent Destailleur
c276283d9f
New: Add errorsToString function
2013-06-28 12:44:17 +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
Laurent Destailleur
3f2730a2ad
Merge pull request #1072 from jfefe/extra_soc
...
Fix : bad element type name for company extrafields into export
2013-06-27 14:40:30 -07:00
Laurent Destailleur
9dea1e54ef
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-27 18:38:06 +02:00
Laurent Destailleur
1223d7c3d0
Fix: Civility field must be blank if not defined.
2013-06-27 18:37:09 +02:00
Laurent Destailleur
7e74d9890b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-27 17:47:03 +02:00
Laurent Destailleur
c92aa1f6aa
New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS
...
Fix: create member was missing field import_key
New: Uniformize code
2013-06-27 17:45:58 +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
c590f6482e
New: Can fetch from ref_ext and name
2013-06-27 14:23:56 +02:00
jfefe
162fc6e6dd
Remove debug info
2013-06-27 13:45:06 +02:00
jfefe
2f6361658a
Can choose several fields to display with extrafield list of table
2013-06-27 13:35:28 +02:00
Florian Henry
1580f92b11
Fix bug for PGSQL Migration 3.4->3.5
...
Fix bug on create invoice from contract
2013-06-27 08:09:28 +02:00
Laurent Destailleur
f02fa8a41d
Fix: css when using checkbox into label
2013-06-26 17:58:34 +02:00
Laurent Destailleur
b5b07f8a14
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-26 16:46:01 +02:00
Laurent Destailleur
696ad07871
LF
2013-06-26 16:45:42 +02:00
Laurent Destailleur
58bdac2dcd
Merge pull request #1066 from atm-maxime/develop
...
Add search on siren (idprof1)
2013-06-26 07:41:07 -07:00
Cédric Salvador
117ddbdff2
add columns if active hooks use the formBuilddocLineOptions method
2013-06-26 15:20:42 +02:00
Cédric Salvador
bfedddd95e
init hook
2013-06-26 15:20:16 +02:00
Cédric Salvador
df94f3816c
add hook to add line options in html.formfile.class.php
2013-06-26 15:19:59 +02:00
Cédric Salvador
59f99c416b
CRLF to LF
2013-06-26 15:19:02 +02:00
Laurent Destailleur
9a5b55219a
Fix: CSS
2013-06-26 14:40:29 +02:00
Laurent Destailleur
1de8ab3785
Fix: CSS
2013-06-26 14:38:56 +02:00
Laurent Destailleur
5f67142fc1
Start prototype for datatable
2013-06-26 11:58:01 +02:00
Laurent Destailleur
8311b83861
Fix: css
2013-06-26 11:41:18 +02:00
Laurent Destailleur
882d34fa88
Fix: css
2013-06-26 11:40:29 +02:00
Laurent Destailleur
9b235f6879
Fix: Remove space at end of binary files
2013-06-26 02:05:18 +02:00
Laurent Destailleur
b3bdc76da3
Trans: More complete examples
2013-06-26 00:05:00 +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
8359a34545
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
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/compta/facture/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1
Fix: warning not always visible. Depends if addon modules were
...
installed. Var should provide a quick fix.
2013-06-25 21:25:09 +02:00
Laurent Destailleur
187feff7d5
Prepare 3.3.3
2013-06-25 20:40:22 +02:00
Laurent Destailleur
0ec4b3bcdb
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-25 18:10:55 +02:00
Laurent Destailleur
285ea8da3f
More info into log
2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516
Add parameter to force user in dol_check_access_document function
...
This required by webservice where global $user is not available
2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2
Fix: Bad translation. Must use a different string than products
2013-06-25 15:00:10 +02:00
Maxime Kohlhaas
76870622e4
Add turnover report by product / serv
2013-06-25 14:54:29 +02:00
Maxime Kohlhaas
2a67d5230d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-06-25 14:47:08 +02:00
Laurent Destailleur
92306ca242
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-25 14:10:07 +02:00
Laurent Destailleur
2d0a85d6f8
New: Add option to send email when paypal or paybox payment is done.
2013-06-25 13:19:44 +02:00
simnandez
ca190be382
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:21:56 +02:00
Maxime Kohlhaas
b22b604d02
Accountancy code on user object in prevision of the complete accountancy module
2013-06-25 11:14:00 +02:00
simnandez
065b30f0d0
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:12:21 +02:00
Maxime Kohlhaas
109d1a71cb
Merge
2013-06-25 11:00:48 +02:00
Maxime Kohlhaas
af5db04824
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-06-25 11:00:30 +02:00
Laurent Destailleur
b5391a0d39
Trans
2013-06-25 09:11:37 +02:00
Laurent Destailleur
1d8b9949d6
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
Laurent Destailleur
7f3a06127a
Fix: Bad regex
2013-06-24 19:55:23 +02:00
Laurent Destailleur
eb07c6b2e7
Fix: Missing left padding
2013-06-24 19:45:29 +02:00
Laurent Destailleur
8d04f5a805
Fix: warning
2013-06-24 19:36:10 +02:00
Laurent Destailleur
cba1d73dd4
Fix: Can autoselect warehouse if only one warehouse
2013-06-24 19:34:56 +02:00
Laurent Destailleur
31f2d8922d
Fix: warning
2013-06-24 19:34:02 +02:00
Laurent Destailleur
f8f0b08bfc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-24 18:33:00 +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
930f6e4850
Fix: avoid error with crlf
2013-06-24 18:04:06 +02:00
Regis Houssin
307ae65924
Fix: crlf to lf for avoid errors with git clone
2013-06-24 17:43:27 +02:00
Regis Houssin
ae67496730
Fix: crlf to lf
2013-06-24 17:41:15 +02:00
Regis Houssin
4cd6ae6bbd
Fix: convert lines delimiters
2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Regis Houssin
ba606bf2e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-24 17:13:58 +02:00
Regis Houssin
cb9dcfa369
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a
New: add product price sharing for multicompany
2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13
New: add product price sharing for multicompany
2013-06-24 17:12:41 +02:00
Laurent Destailleur
7778a17a89
Qual: clean code from deprecated vars
2013-06-24 16:41:31 +02:00
Maxime Kohlhaas
ac205aac2d
Add search on siren (idprof1)
2013-06-24 10:05:29 +02:00
Maxime Kohlhaas
0d3b7f1a0f
merge
2013-06-24 10:01:23 +02:00
Laurent Destailleur
871c3d9d07
Fix: debug module cron
2013-06-23 22:30:33 +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
7fb8a740e7
Fix: bad function
2013-06-23 18:54:18 +02:00
Laurent Destailleur
7bfdec7993
Fix: css
2013-06-23 18:53:40 +02:00
Laurent Destailleur
db48acddb4
Fix: css
2013-06-23 18:51:49 +02:00
Laurent Destailleur
b49a1168e3
Fix: Use div for tables when there is a different form on each line.
2013-06-23 18:33:03 +02:00
Laurent Destailleur
e1bb3bafb7
Fix: css
2013-06-23 18:01:10 +02:00
Laurent Destailleur
1d2f09688e
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064
Fix: Css for fieldset
2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9
Fix: W3C
2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6
Fix: Search filter was lost
2013-06-23 13:00:02 +02:00
Laurent Destailleur
f2c268f72c
Fix: Missing theme for autofill
2013-06-23 12:43:06 +02:00
Laurent Destailleur
0ab500d3a7
Merge pull request #1063 from grandoc/develop
...
standardize code
2013-06-21 08:10:01 -07:00
Laurent Destailleur
570275cd76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1
Fix: Bad position of field
2013-06-21 15:26:46 +02:00
simnandez
ba6b5d27a5
New: TODO il faut incrementer le stock si on supprime une expedition
...
validee
2013-06-20 18:37:23 +02:00
Laurent Destailleur
7e748f26a6
Fix: all forms must react same way with option optimize_small_screen
2013-06-20 16:39:17 +02:00
Laurent Destailleur
a1f9b22210
Fix: Missing icon
2013-06-20 16:21:54 +02:00
Laurent Destailleur
a749e2bfaa
Fix: Still working on css debug. bureau2crea and cameleo are too
...
bugged. I disable them with jmobile to have things working correctly.
Conflicts:
htdocs/theme/bureau2crea/style.css.php
2013-06-20 16:20:31 +02:00
Laurent Destailleur
b477272082
Fix: Still working on css debug. bureau2crea and cameleo are too
...
bugged. I disable them with jmobile to have things working correctly.
2013-06-20 16:13:42 +02:00
Laurent Destailleur
4268ca0de2
Missing space
2013-06-20 09:40:02 +02:00
Laurent Destailleur
66d02240f5
Fix: Missing translation
2013-06-20 09:36:36 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
f987fd2245
Fix: Inconsistency arrays into php function
2013-06-19 23:46:46 +02:00
Laurent Destailleur
7f660302e2
Fix: Inconsistency arrays into php function
2013-06-19 23:46:18 +02:00
Laurent Destailleur
ec2e4c8a8b
Fix: parenthesis at wrong place
2013-06-19 22:58:35 +02:00
Laurent Destailleur
c0b4ff3616
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-19 19:54:00 +02:00
Laurent Destailleur
aaad4d3474
Fix: Menu cheque depends on bank module and not invoice.
2013-06-19 19:52:20 +02:00
Laurent Destailleur
9f39671886
Fix: Bad translation
2013-06-19 19:40:19 +02:00
Laurent Destailleur
5667fceba8
Merge pull request #1061 from GPCsolutions/group_concat
...
Added group_concat equivalent to PgSQL
2013-06-19 09:34:38 -07:00
Laurent Destailleur
ad49f965d5
Merge pull request #1060 from FHenry/3.3
...
Fix trad holidays module
2013-06-19 09:34:10 -07:00
Laurent Destailleur
d6d7665e65
Merge pull request #1059 from marcosgdf/translations
...
Fixed es_ES translation typo
2013-06-19 09:34:03 -07:00
Laurent Destailleur
374718f735
Merge pull request #1056 from FHenry/dev_projecthtmlform
...
Continue normalizing project html.formprojet.class.php
2013-06-19 09:32:35 -07:00
Laurent Destailleur
2a014f8c7c
Merge pull request #1057 from marcosgdf/develop
...
CR Fix
2013-06-19 09:31:28 -07:00
Laurent Destailleur
6779724dc0
Merge pull request #1055 from FHenry/3.4
...
Fix ODT to PDF exec scripts path
2013-06-19 09:30:11 -07:00
Laurent Destailleur
bcc9b81bab
Merge pull request #1052 from PaulPoulain/943
...
T943: Put the total of the price at the bottom of the propal list
2013-06-19 09:29:29 -07:00
Laurent Destailleur
b5f4c45cf0
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-19 18:14:19 +02:00
Laurent Destailleur
09317e2034
Fix: Pb with firstname/lastname and font size
2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779
Fix: Pb with firstname/lastname and font size
2013-06-19 18:08:05 +02:00
Laurent Destailleur
5cb2ba3909
Several fixes in CSS
...
Conflicts:
htdocs/core/menus/standard/empty.php
2013-06-19 17:02:09 +02:00
Laurent Destailleur
e92e6f7131
Fix: Icon of wrong version
2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5
Fix: Pb in css
2013-06-19 17:00:01 +02:00
Laurent Destailleur
850ee5e195
Several fixes in CSS
2013-06-19 16:59:03 +02:00
Laurent Destailleur
8dd34c194e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-19 16:51:32 +02:00
Laurent Destailleur
8b25a5cbf5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-19 16:48:57 +02:00
Laurent Destailleur
5ee3d67488
Fix: Icon of wrong version
2013-06-19 16:44:04 +02:00
Raphaël Doursenaud
2f8954acb3
Added group_concat equivalent to PgSQL
2013-06-19 15:54:27 +02:00
Laurent Destailleur
51d40b94cc
Fix: Pb in css
2013-06-19 15:52:06 +02:00
Florian Henry
035edc12ce
Fix [ bug #945 ] error adding a service
2013-06-19 14:41:18 +02:00
Laurent Destailleur
d32b36ce29
Fix: css with jmobile
2013-06-19 14:04:25 +02:00
Laurent Destailleur
dcaaa84ddb
Fix: css with jmobile
2013-06-19 14:03:54 +02:00
Florian Henry
835b8e9d7e
Fix trad holidays
2013-06-19 11:23:43 +02:00
Florian Henry
ee1e266774
Fix trad holidays module
2013-06-19 11:22:53 +02:00
Marcos García
76d9ba6a43
Fixed es_ES translation typo
2013-06-19 10:24:24 +02:00
Marcos García
676191c1f9
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
2013-06-19 10:22:46 +02:00
Florian Henry
08e0e8244a
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-19 10:07:32 +02:00
Marcos García
4532399026
CR Fix
...
I'm getting tired of these commits...
2013-06-19 09:26:20 +02:00
Laurent Destailleur
965b173451
Fix: hooks for leftmenu must not be loaded if left menu hidden, also
...
hooks were lost into page search_page.
2013-06-19 00:12:35 +02:00
Laurent Destailleur
bd8271ee24
Fix: hooks for leftmenu must not be loaded if left menu hidden, also
...
hooks were lost into page search_page.
2013-06-19 00:11:42 +02:00
Laurent Destailleur
f0aac521d0
Fix: civility label
2013-06-18 23:28:55 +02:00
Laurent Destailleur
66e0f80aa2
Fix: civility label
2013-06-18 23:28:03 +02:00
Laurent Destailleur
8f60d60e8d
Fix: Bad return url
2013-06-18 22:12:49 +02:00
Laurent Destailleur
73e3ef3a82
Fix: Bad return url
2013-06-18 22:12:17 +02:00
Laurent Destailleur
c45cd3aa1c
Fix: Tab must not always be visible
2013-06-18 21:44:18 +02:00
lalaina rasamoelina
e8f26ad33b
T943 If there is only one page, we keep label "Total HT", but if there is more than one page, we use "Total HT for this page"
2013-06-18 10:59:19 +02:00
Laurent Destailleur
71b61fc1f5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/langs/fr_FR/mails.lang
htdocs/user/logout.php
2013-06-18 09:51:37 +02:00
Florian Henry
cac7cbebd4
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-18 09:46:49 +02:00
Florian Henry
dc5db0c137
fix ODT to PDF script path
2013-06-18 09:07:53 +02:00
Laurent Destailleur
e8e710fd0c
Fix: Translation
2013-06-17 23:53:03 +02:00
Laurent Destailleur
562fa43d9d
Fix: Message is not clear enough.
...
Fix: Var was not initialized.
2013-06-17 23:24:53 +02:00
Laurent Destailleur
f0c8c1805f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-17 22:11:24 +02:00
Laurent Destailleur
9becf83d70
Keep zapfdingbats.
2013-06-17 22:10:44 +02:00
Florian Henry
83116b5627
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-17 16:23:54 +02:00
Laurent Destailleur
326387ab75
Fix: Missing lang
2013-06-17 15:00:40 +02:00
Laurent Destailleur
8b73b2b4f3
Fix: Solve some problem of redirect when logout
...
Conflicts:
htdocs/user/logout.php
2013-06-17 14:54:44 +02:00
Laurent Destailleur
ac16127894
Fix: Solve some problem of redirect when logout
2013-06-17 14:47:14 +02:00
Florian Henry
8a6a3fc9f4
Continue normalizing project html.formprojet.class.php
2013-06-17 14:25:33 +02:00
Laurent Destailleur
834a3fd3c5
Qual: Clean code. Removed useless functions and params
2013-06-17 14:12:59 +02:00
Laurent Destailleur
2042fc3a21
Qual: Update jquery.tablednd plugin. Use minified version (all embedded
...
plugins should use minified version).
2013-06-17 13:16:25 +02:00
Florian Henry
7cc7e8392d
Fix ODT to PDF exec scripts path
2013-06-17 11:58:59 +02:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
7ec8220826
Merge pull request #1054 from marcosgdf/develop
...
CR fix
2013-06-16 15:05:28 -07:00
Laurent Destailleur
9012c49299
Perf: Optimize class loading. Need 1 MB less of memory to load home
...
page.
2013-06-16 23:15:20 +02:00
Marcos García
bf2d61515d
CR fix
...
Git required me to commit these changes
2013-06-16 21:33:05 +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
c83bce262e
Fix: Do not show time if start time was not calculated
2013-06-16 20:22:32 +02:00
Laurent Destailleur
91068a4476
Fix: Pb into form output
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-06-16 20:16:05 +02:00
Laurent Destailleur
0690e8c39e
Fix: Pb into form output
2013-06-16 20:08:45 +02:00
Laurent Destailleur
fee958eafb
Add comments
2013-06-16 12:23:00 +02:00
Laurent Destailleur
8410ad1933
Fix: CSS
2013-06-16 12:03:27 +02:00
Laurent Destailleur
696a97db4e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-16 12:00:36 +02:00
Laurent Destailleur
b9a1a3e096
Fix: CSS
2013-06-16 12:00:18 +02:00
Laurent Destailleur
b40e2b85ca
Merge pull request #1053 from FHenry/dev_projecthtmlform
...
Start normalize project module : create html.formprojet.class.php with … selec_project
2013-06-15 15:25:57 -07:00
Laurent Destailleur
377f308d08
Merge pull request #1049 from PaulPoulain/935
...
T935 put a filter on the author in the propal list
2013-06-15 15:17:58 -07:00
Laurent Destailleur
2005f0ba81
Merge pull request #1047 from PaulPoulain/929
...
929
2013-06-15 12:55:23 -07:00
Laurent Destailleur
6781d43265
Merge pull request #1046 from marcosgdf/develop
...
CR fix
2013-06-15 12:54:32 -07:00
Florian Henry
f2e2815cc1
Merge branch 'develop' into dev_projecthtmlform
2013-06-15 11:56:45 +02:00
Laurent Destailleur
706b0d562f
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-15 01:09:08 +02:00
Florian Henry
8fb2b8fa12
Start normalize project module : create html.formprojet.class.php with
...
selec_project
2013-06-14 22:33:01 +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
0a9cf26a32
Fix: Bad closing of div
2013-06-14 19:51:53 +02:00
Laurent Destailleur
af8c4cd0d3
Fix: Bad closing of div
2013-06-14 19:46:43 +02:00
Laurent Destailleur
2f386b1b36
Fix: Bad closing of div
2013-06-14 19:43:45 +02:00
lalaina rasamoelina
feb7af490a
T943: Put the total of the priceat the bottom of the propal list
2013-06-14 15:46:11 +02:00
simnandez
684c086ad0
Fix: param must be a string
2013-06-14 15:37:28 +02:00
lalaina rasamoelina
9649e731b8
T935 put a filter on the author in the propal list
2013-06-14 15:05:58 +02:00
lalaina rasamoelina
8139e6e5f0
T929 put the button to remove filter in company list
2013-06-14 14:56:49 +02:00
lalaina rasamoelina
57c4d7212d
T929 Printed all the name that have been cut to 30 char
2013-06-14 14:56:04 +02:00
Marcos García
829b3bfc1d
CR fix
...
GIt required mi to commit this changes
2013-06-14 12:48:27 +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
bc5fa5972a
Drop deprecated tables
2013-06-14 02:26:24 +02:00
Laurent Destailleur
a9edbf4f24
Fix: Bad size of image
2013-06-14 02:25:44 +02:00
Laurent Destailleur
8ed5dfeded
Fix: Bad styles of html elements
2013-06-14 02:15:43 +02:00
Laurent Destailleur
b3ca9de399
Fix: Update select with list
2013-06-14 02:09:34 +02:00
Laurent Destailleur
02f1271fc4
New: Add option ADHERENT_LOGIN_NOT_REQUIRED
2013-06-14 01:30:43 +02:00
Laurent Destailleur
499440be16
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-14 01:29:43 +02:00
Laurent Destailleur
c1b21d1480
Fix: Option not working
2013-06-14 01:29:05 +02:00
Laurent Destailleur
396cbcec62
Fix: Do not update twice level 1
...
Conflicts:
htdocs/product/admin/product_tools.php
2013-06-14 01:23:54 +02:00
Laurent Destailleur
99cbee6486
Fix: Do not update twice level 1
2013-06-14 01:22:38 +02:00
Laurent Destailleur
b3e81afae4
Merge pull request #1045 from FHenry/3.4
...
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 16:05:01 -07:00
Laurent Destailleur
9ff6b4c23e
Fix: Too large top
2013-06-14 00:46:02 +02:00
Florian Henry
184f1a4b15
revert Jean modif
2013-06-14 00:44:58 +02:00
Laurent Destailleur
980901b557
Qual: id of an instance should not be provided into method of instance
2013-06-14 00:23:38 +02:00
Laurent Destailleur
6750987dcb
Qual: id of an instance should not be provided into method of instance
2013-06-14 00:21:17 +02:00
Laurent Destailleur
5f60a7c88c
Fix: Multiprices were not update by mass vat update tool
2013-06-14 00:11:57 +02:00
Laurent Destailleur
bd8f1f2d2f
Fix: Multiprices were not update by mass vat update tool
2013-06-14 00:11:15 +02:00
Laurent Destailleur
d3a500d6c4
Fix: Missing price level for triggers
2013-06-13 23:26:06 +02:00
Laurent Destailleur
12c3fe2558
Fix: Missing price level for triggers
2013-06-13 23:24:58 +02:00
Laurent Destailleur
8757fc1dba
Fix: css pb with jmobile
2013-06-13 21:43:19 +02:00
Florian Henry
2704ba5f36
Fix bug on attach element in element.php (simply not work before...)
2013-06-13 18:11:23 +02:00
Laurent Destailleur
d9f5151c39
Fix: Bad default value for finished property
2013-06-13 15:53:17 +02:00
Florian Henry
eb298e0557
Merge file from Jean Heimberger
2013-06-13 15:24:09 +02:00
Florian Henry
1d8b2fa2c1
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-13 15:08:09 +02:00
Florian Henry
1ecc24216f
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:07:50 +02:00
Florian Henry
fb0a99cb55
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
2013-06-13 15:05:19 +02:00
Marcos García
f25731b748
CR Fix
...
Git required me to commit these changes
2013-06-12 22:36:30 +02:00
Laurent Destailleur
febe74ad17
Merge pull request #1038 from marcosgdf/clone-composition
...
Clone composition
2013-06-12 13:26:40 -07:00
Laurent Destailleur
93c71d00f7
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/class/hookmanager.class.php
2013-06-12 22:17:15 +02:00
Laurent Destailleur
32244743d2
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-12 22:12:37 +02:00
Laurent Destailleur
977cd8ca4c
Fix: filtering was deleting data !
2013-06-12 22:12:06 +02:00
Laurent Destailleur
c7868e2471
Fix: css
2013-06-12 21:57:09 +02:00
Marcos García
13bcb5daaa
Merge branch 'develop' into clone-composition
...
Conflicts:
ChangeLog
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-06-12 16:39:23 +02:00
Laurent Destailleur
2483f044c5
Fix: Trans
2013-06-12 16:28:36 +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
Florian Henry
b4485efdeb
Merge branch 'develop' into develop_926_927_928
...
Conflicts:
htdocs/core/class/extrafields.class.php
Change-Id: Ia54e1be6954bc28f81122e88e398bda8059ab536
2013-06-11 21:41:57 +02:00
Laurent Destailleur
4ba24ed8d7
Fix: Missing empty value
2013-06-11 12:58:52 +02:00
Laurent Destailleur
897d1251c8
Fix: Better fix for cleaning vars (i'm tired today)
2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166
Fix: Better fix for cleaning vars
2013-06-11 12:01:12 +02:00
Laurent Destailleur
bf2fa31585
Merge pull request #1041 from FHenry/develop
...
Add hook into referent product screen
2013-06-11 02:56:37 -07:00
Laurent Destailleur
8f3ba0dacc
Fix: Better fix for cleaning vars
2013-06-11 11:49:59 +02:00
Florian Henry
8510c9c0d7
Add hook into referent product screen
2013-06-11 11:46:38 +02:00
Laurent Destailleur
4326bfb606
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/tr_TR/admin.lang
htdocs/langs/tr_TR/agenda.lang
htdocs/langs/tr_TR/banks.lang
htdocs/langs/tr_TR/bills.lang
htdocs/langs/tr_TR/bookmarks.lang
htdocs/langs/tr_TR/boxes.lang
htdocs/langs/tr_TR/cashdesk.lang
htdocs/langs/tr_TR/categories.lang
htdocs/langs/tr_TR/commercial.lang
htdocs/langs/tr_TR/companies.lang
htdocs/langs/tr_TR/compta.lang
htdocs/langs/tr_TR/contracts.lang
htdocs/langs/tr_TR/deliveries.lang
htdocs/langs/tr_TR/dict.lang
htdocs/langs/tr_TR/donations.lang
htdocs/langs/tr_TR/ecm.lang
htdocs/langs/tr_TR/errors.lang
htdocs/langs/tr_TR/exports.lang
htdocs/langs/tr_TR/externalsite.lang
htdocs/langs/tr_TR/ftp.lang
htdocs/langs/tr_TR/help.lang
htdocs/langs/tr_TR/holiday.lang
htdocs/langs/tr_TR/install.lang
htdocs/langs/tr_TR/interventions.lang
htdocs/langs/tr_TR/languages.lang
htdocs/langs/tr_TR/ldap.lang
htdocs/langs/tr_TR/mailmanspip.lang
htdocs/langs/tr_TR/mails.lang
htdocs/langs/tr_TR/main.lang
htdocs/langs/tr_TR/margins.lang
htdocs/langs/tr_TR/members.lang
htdocs/langs/tr_TR/orders.lang
htdocs/langs/tr_TR/oscommerce.lang
htdocs/langs/tr_TR/other.lang
htdocs/langs/tr_TR/paybox.lang
htdocs/langs/tr_TR/paypal.lang
htdocs/langs/tr_TR/products.lang
htdocs/langs/tr_TR/projects.lang
htdocs/langs/tr_TR/propal.lang
htdocs/langs/tr_TR/sendings.lang
htdocs/langs/tr_TR/shop.lang
htdocs/langs/tr_TR/sms.lang
htdocs/langs/tr_TR/stocks.lang
htdocs/langs/tr_TR/suppliers.lang
htdocs/langs/tr_TR/trips.lang
htdocs/langs/tr_TR/users.lang
htdocs/langs/tr_TR/withdrawals.lang
htdocs/langs/tr_TR/workflow.lang
2013-06-11 10:43:36 +02:00
Laurent Destailleur
5f9f709a70
Fix: vars must be cleaned for next call
2013-06-11 10:21:28 +02:00
Laurent Destailleur
6872b3f0c4
Trans: Add missing entries
2013-06-11 10:06:22 +02:00
Regis Houssin
d9f2ad4ff4
Revert "Fix: hookmanager code"
...
This reverts commit 89c3cfec3a
2013-06-11 09:36:39 +02:00
Laurent Destailleur
1c8edb9cb5
Use currency symbol instead of text
2013-06-11 02:06:34 +02:00
Laurent Destailleur
f4fd71d1f9
Fix: Bad position of currency for USD
2013-06-11 02:05:40 +02:00
Laurent Destailleur
50ff8ab52e
Update turkish
2013-06-11 01:02:44 +02:00
Laurent Destailleur
b35274bd30
Update to turkish
2013-06-11 00:28:42 +02:00
Laurent Destailleur
1f95c5d59f
Revert "Fix: hookmanager code"
...
This reverts commit 2bdf900db9
2013-06-11 00:08:15 +02:00
Regis Houssin
2bdf900db9
Fix: hookmanager code
...
Conflicts:
htdocs/core/lib/pdf.lib.php
Change-Id: I4dac5a939abdcbe60fcd1bb21465fabde1324089
2013-06-10 19:51:07 +02:00
Regis Houssin
89c3cfec3a
Fix: hookmanager code
2013-06-10 19:46:37 +02:00
Laurent Destailleur
9ce993fada
Fix: skin
2013-06-10 19:18:36 +02:00
Laurent Destailleur
482a771e7c
Fix: Some quality fixes
2013-06-10 19:04:04 +02:00
Laurent Destailleur
83cf8a8e73
Merge pull request #1039 from grandoc/develop
...
fix : language error
2013-06-10 09:08:07 -07:00
Laurent Destailleur
9ae32c418f
Merge pull request #1037 from defrance69/patch-21
...
Update fiche.php
2013-06-10 09:06:56 -07:00
Laurent Destailleur
48b33a7678
Merge pull request #1036 from defrance69/patch-20
...
Create html.formcontract.class.php
2013-06-10 09:06:41 -07:00
Laurent Destailleur
a925d8d535
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-10 17:01:24 +02:00
Laurent Destailleur
56d8807e92
Fix logo after renaming menu
2013-06-10 16:32:44 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Grand Philippe
43cb1e6a4b
fix : language error
2013-06-10 14:51:52 +02:00
Florian Henry
4f43ec0acf
Add extrafield tables
2013-06-10 14:13:44 +02:00
Marcos García
e727100cf0
New: Clone product/service composition
2013-06-10 00:11:25 +02:00
Marcos García
9c0fe61a21
Fix CR
2013-06-10 00:09:16 +02:00
BENKE Charles
b42a3a716d
Update fiche.php
...
change the call of select_contract function
2013-06-09 22:15:37 +03:00
BENKE Charles
6167fedff8
Create html.formcontract.class.php
...
Add select_contract function who create à lisbox of contract
2013-06-09 22:08:05 +03:00
Laurent Destailleur
b8f721092f
Removed useless comments
2013-06-09 18:36:47 +02:00
Laurent Destailleur
0aab0cca75
Fix doxygen
2013-06-09 18:29:06 +02:00
Laurent Destailleur
88291e423f
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067
Doxygen
2013-06-09 18:24:30 +02:00
Florian Henry
4f438224d7
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984
Fix bug on extrafeild type price and double
2013-06-09 16:56:29 +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
1e0cb64bce
Fix: Bad error management
2013-06-09 16:15:49 +02:00
Laurent Destailleur
050819ce0b
Fix: dead code
2013-06-09 16:15:12 +02:00
Laurent Destailleur
9bb539843f
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-09 16:14:19 +02:00
Laurent Destailleur
e85b72e452
Fix: Bad error management
2013-06-09 15:59:51 +02:00
Laurent Destailleur
e6155ebfd8
Fix: missing class
2013-06-09 12:56:20 +02:00
Laurent Destailleur
7d2f904174
Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working
2013-06-09 12:47:44 +02:00
Laurent Destailleur
49d65e5ebe
Fix: criteria of select
2013-06-09 03:10:31 +02:00
Marcos García
f0454926c2
Fix bug #933 : Ajax error
...
Caused by commit 7e53f98
2013-06-08 22:29:18 +02:00
Marcos García
3b28de0a07
Fixed some translation problems
2013-06-08 21:57:57 +02:00
Marcos García
cf6bfcc9c4
Missing translations
2013-06-08 20:31:39 +02:00
Marcos García
a06de736c2
Merge branch '3.4' into translations
2013-06-08 20:29:07 +02:00
Marcos García
17efbd41c7
Improved es_ES translation
2013-06-08 20:18:09 +02:00
Marcos García
000de9530d
Fixed wrong translation key and and improved es_ES translations
2013-06-08 20:15:48 +02:00
Marcos García
3cff899b44
Removed debug message and wrong translation key
2013-06-08 20:01:51 +02:00
Marcos García
532c56002d
Entities problem with error message in predefined invoice creation
2013-06-08 19:07:13 +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
0ffb01e347
Fix: Remove duplicate key
2013-06-08 16:35:52 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Laurent Destailleur
f65e16ae9c
Fix: Add key into english to not loose them with transifex into other
...
languages
2013-06-08 16:05:01 +02:00
Laurent Destailleur
e13974b5f3
Fix: tcpdf bug
2013-06-08 15:29:27 +02:00
Laurent Destailleur
2c71c898eb
Fix: param lang not provided to price function
2013-06-08 15:21:47 +02:00
Laurent Destailleur
afbe6c1808
Fix: translation
2013-06-08 14:56:40 +02:00
Laurent Destailleur
3c9fef8eea
Fix: choice of percentage was lost
2013-06-08 01:33:16 +02:00
Laurent Destailleur
319295554d
Fix: Free memory after request
2013-06-08 00:52:02 +02:00
Laurent Destailleur
9fae9da6a1
Fix: proxy was not used everywhere, timeout was not set everywhere.
2013-06-07 20:09:15 +02:00
Laurent Destailleur
c3f5e0c6ee
New: Show version of client lib used by mysql drivers
2013-06-07 19:19:11 +02:00
Laurent Destailleur
dd43f7a890
Fix: memory not freed
2013-06-07 19:12:38 +02:00
Laurent Destailleur
0806d00b47
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-07 18:45:13 +02:00
Laurent Destailleur
a88a3bb877
Look: More neutral css to match with other skins
2013-06-07 16:39:29 +02:00
Laurent Destailleur
a27d71f083
Fix: Miscellaneous fixes into cachdesk module:
...
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
2013-06-07 15:59:47 +02:00
Laurent Destailleur
0f5f6760a9
Fix: Miscellaneous fixes into cachdesk module:
...
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
2013-06-07 15:58:15 +02:00
Laurent Destailleur
c78d5aa4a7
Fix: Bad param 'zone' into printCommon
2013-06-07 14:52:25 +02:00
Laurent Destailleur
421c3fb35b
Fix: Bad param 'zone' into printCommon
2013-06-07 13:41:32 +02:00
Laurent Destailleur
35fbc9b066
- New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO.
2013-06-07 12:43:41 +02:00
Laurent Destailleur
693f4f3b8b
Fix: Pb of offset in numbering. Add also phpunit test to detect and test
...
fix.
Conflicts:
test/phpunit/NumberingModulesTest.php
2013-06-06 21:25:10 +02:00
Laurent Destailleur
21c6d42d82
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-06 21:19:03 +02:00
Laurent Destailleur
31fe378f3b
Fix: Pb of offset in numbering. Add also phpunit test to detect and test
...
fix.
2013-06-06 21:18:50 +02:00
Laurent Destailleur
368efc77e0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-06 18:56:59 +02:00
Laurent Destailleur
4654e811b2
Close taks [ task #645 ]. We keep fields, just add comment into tables
...
with explanation of fields.
2013-06-06 18:54:17 +02:00
Cédric Salvador
8ad2fad817
fixed select_thirdparty_list call in the select_company function
2013-06-06 18:31:52 +02:00
Cédric Salvador
b747b0349d
merge
2013-06-06 18:31:33 +02:00
Laurent Destailleur
09526dd234
Merge pull request #1025 from grandoc/develop
...
code was displayed twice
2013-06-06 00:59:49 -07:00
Laurent Destailleur
4083d9a819
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-06 09:49:54 +02:00
Laurent Destailleur
4bc8cbc993
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-06 09:43:02 +02:00
Laurent Destailleur
bf8fd7d34f
Fix: CSS
2013-06-06 09:42:39 +02:00
Grand Philippe
db6d226ffd
code was displayed twice
2013-06-06 09:22:26 +02:00
Laurent Destailleur
8bad0fc97d
Merge pull request #1024 from csalvador/updateline-bug
...
fixed bug when editing a supplier order line
2013-06-05 15:41:02 -07:00
Laurent Destailleur
b7f697e8c4
Remove a call of a deprecated function
2013-06-05 22:27:02 +02:00
Laurent Destailleur
8e13c4eddf
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-05 22:11:28 +02:00
Laurent Destailleur
56f9d8f50c
Fix: missing style
2013-06-05 22:10:43 +02:00
Laurent Destailleur
7e53f98baa
Qual: Uniformize code
2013-06-05 22:01:35 +02:00
Laurent Destailleur
52407f88c4
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-05 21:59:23 +02:00
Laurent Destailleur
0b481f285a
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-05 21:56:37 +02:00
Laurent Destailleur
61d5359f23
Fix: Uniformize menu entries
2013-06-05 21:55:51 +02:00
Laurent Destailleur
e25651204c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/admin.lib.php
2013-06-05 18:56:41 +02:00
Cédric Salvador
37ef86379f
fixed bug when editing a supplier order line
2013-06-05 18:19:50 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Raphaël Doursenaud
686f5add82
Normalized line endings to LF
2013-06-05 16:12:07 +02:00
Laurent Destailleur
ebb8f05f09
Subscription to ML can also be done according to member type
2013-06-05 15:53:27 +02:00
Laurent Destailleur
e9ed4472d4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-05 15:44:59 +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
simnandez
26b36f3a4e
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:10:31 +02:00
simnandez
097fbaacd0
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:30 +02:00
simnandez
a4841dacda
Fix: Warning missing argument 2 into withdrawals
2013-06-05 15:09:13 +02:00
Laurent Destailleur
e4a3929a5c
Fix: Minor fixes into style.
2013-06-05 14:23:49 +02:00
Laurent Destailleur
3e1d2c3e63
Qual: Mutualized and uniformize code
2013-06-05 11:21:45 +02:00
Laurent Destailleur
c4f90f8174
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-05 11:10:25 +02:00
Laurent Destailleur
7aa145ae6a
Fix: Previous fix was not complete
2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70
Fix: ModelDoc Activation bug
2013-06-05 10:49:12 +02:00
Laurent Destailleur
a34ab5a13f
Look: Email at a better place
2013-06-04 23:19:04 +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
7b0897a669
fix: LF
2013-06-04 22:03:11 +02:00
Laurent Destailleur
d3cf8479e3
Try to commit a file with a line with CRLF and see...
2013-06-04 19:36:41 +02:00
Laurent Destailleur
94d1f23721
Merge pull request #1019 from GPCsolutions/3.3-societefix
...
Fixed field name
2013-06-04 10:19:44 -07:00
Raphaël Doursenaud
880a27f827
Fixed field name
2013-06-04 18:40:46 +02:00
Laurent Destailleur
3ee668b4da
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-04 12:11:56 +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
3cb6e196b6
Fix: [ bug #919 ] SQL error in product/stock/product.php
2013-06-04 00:31:54 +02:00
Laurent Destailleur
073a04f8cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-04 00:31:04 +02:00
Laurent Destailleur
205ff535a9
Fix: [ bug #919 ] SQL error in product/stock/product.php
2013-06-04 00:30:38 +02:00
Laurent Destailleur
c60e94c723
Merge pull request #1018 from fappels/develop
...
Added flemish legal forms to belgium entries
2013-06-03 14:43:35 -07:00
Laurent Destailleur
2e1170297c
Merge pull request #1015 from defrance69/patch-17
...
Update fiche.php
2013-06-03 14:37:19 -07:00
Laurent Destailleur
a5800fbd8b
Merge pull request #1014 from defrance69/patch-16
...
Update fichinter.class.php
2013-06-03 14:36:47 -07:00
Laurent Destailleur
b1a280de32
Fix: error message
2013-06-03 23:11:36 +02:00
Laurent Destailleur
22bde298de
Fix: First permission must start with 1
2013-06-03 23:06:15 +02:00
Laurent Destailleur
26ac8f9f28
Fix: Missing translation
2013-06-03 22:17:03 +02:00
Laurent Destailleur
12973dbdb4
Look: Minor enhancement
...
Fix: Option to fix bug to send email on by default.
2013-06-03 22:06:28 +02:00
Laurent Destailleur
205335f347
Fix: Readonly mode for email was ok for eldy only.
2013-06-03 20:16:07 +02:00
Laurent Destailleur
e871ea64eb
Fix: Regression
2013-06-03 19:52:34 +02:00
Laurent Destailleur
b4c5114ee6
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04
Fix: syntax error
2013-06-03 19:25:12 +02:00
Laurent Destailleur
1aa5535741
New: Add function to get http content
2013-06-03 17:44:55 +02:00
Francis Appels
1a480b4e68
modified abrviation of code 227
2013-06-03 16:34:44 +02:00
Laurent Destailleur
c1dd2f20cd
Qual: Clean code.
2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e
Fix: Bad regex
2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c
Fix: Loading of boxes from external modules
2013-06-03 12:43:14 +02:00
Laurent Destailleur
7dc984fd6f
Fix: Loading of boxes from external modules
2013-06-03 11:33:13 +02:00
Laurent Destailleur
a1a8fac25c
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-03 11:15:15 +02:00
Laurent Destailleur
6cf1d25529
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2013-06-03 11:09:40 +02:00
BENKE Charles
d331596d19
Update fiche.php
...
Add contract link
2013-06-03 01:49:49 +02:00
BENKE Charles
949a2c0ac5
Update fichinter.class.php
...
add contract link
2013-06-03 02:43:12 +03:00
Laurent Destailleur
4f0758f9b1
Merge pull request #1011 from marcosgdf/minor
...
Avoid warnings
2013-06-02 04:29:23 -07:00
Laurent Destailleur
25e8b39ca8
Merge pull request #1010 from marcosgdf/bug-908
...
Fix: [bug #908 ] Erreur lors de la configuration du module
2013-06-02 04:17:48 -07:00
Laurent Destailleur
1a8c349d6a
Merge pull request #1012 from fappels/221bac2791e7eb3b2a2b9d24e38b0103a8de84f5
...
FIX: translations for correct Commercial PDF docs
2013-06-02 04:14:41 -07:00
Laurent Destailleur
b75893b3de
Merge pull request #1013 from marcosgdf/style
...
Fixed empty table when few modules are activated in product card view
2013-06-02 04:07:49 -07:00
Marcos García
c12da33dcd
Fixed empty table when few modules are activated in product card view
2013-06-02 00:37:33 +02:00
Laurent Destailleur
c5783215c4
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:45:03 +02:00
Francis Appels
7c0f7e1630
Added flemish legal forms to belgium entries
...
Added flemish legal forms to belgium entries, so flemish company can
show correct info on his commerial documents
2013-06-01 17:21:39 +02:00
Francis Appels
221bac2791
FIX: translations for correct Commercial PDF docs
...
Corrected translations, so correct Commercial PDF documents will be
generated. Corrected also some auto translations.
2013-06-01 17:12:04 +02:00
Marcos García
cf1d269f15
Avoid warnings
2013-06-01 16:11:45 +02:00
Marcos García
7b20757449
Fix: [bug #908 ] Erreur lors de la configuration du module
2013-06-01 15:51:17 +02:00
Marcos García
8ae0939ae5
Fixed bug #903 : Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php
2013-06-01 15:39:45 +02:00
Laurent Destailleur
c6411477d7
Clean dead comments
2013-06-01 15:36:37 +02:00
Laurent Destailleur
520101bdfb
Fix: Missing vat rate
2013-06-01 02:52:25 +02:00
Laurent Destailleur
9b96e38a35
Fix: Update vat rates for canada
...
Conflicts:
htdocs/langs/fr_CA/main.lang
2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d
Fix: Missing mayotte
2013-06-01 02:21:39 +02:00
Laurent Destailleur
b3b80701fd
Fix: Bug with jmobile
2013-06-01 02:03:19 +02:00
Laurent Destailleur
9934852f13
Trans
2013-06-01 01:16:42 +02:00
Laurent Destailleur
0f27a9e4d4
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-01 00:29:09 +02:00
Laurent Destailleur
4b0b6fdd55
Fix: Avoid pb with jmobile
2013-06-01 00:24:13 +02:00
Laurent Destailleur
3395fd6d8d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/fr_CA/main.lang
htdocs/main.inc.php
2013-06-01 00:04:51 +02:00
Raphaël Doursenaud
9f1eb0676b
Fix install with PostgreSQL
...
The language should be lowercase and unquoted
2013-06-01 00:02:13 +02:00
Laurent Destailleur
500c29f014
Merge pull request #1008 from fappels/patch-2
...
Fix: translations
2013-05-31 14:53:35 -07:00
Laurent Destailleur
743da5a214
Fix: function to get localtax1 or 2 value from vat rate return bad value
...
when countries differs.
Conflicts:
htdocs/langs/fr_CA/main.lang
2013-05-31 21:33:48 +02:00
Laurent Destailleur
92346296f0
Doxygen
2013-05-31 21:17:49 +02:00
Laurent Destailleur
a85fea9317
Fix: function to get localtax1 or 2 value from vat rate return bad value
...
when countries differs.
2013-05-31 21:03:24 +02:00
Laurent Destailleur
b4c4211b98
Fix: was using bad params and not complete.
2013-05-31 20:09:26 +02:00
Laurent Destailleur
06fc0eec5b
Fix: Update vat rates for canada
2013-05-31 19:53:45 +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
5254f102ba
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 16:34:02 +02:00
Laurent Destailleur
ba6d82686f
Fix: Menu dictionnary
2013-05-31 14:54:10 +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
Laurent Destailleur
4133bfc3a4
Fix: Ton of bugs into bank categ editor (W3C, update error, syntax
...
error...)
2013-05-31 11:15:13 +02:00
Laurent Destailleur
da40c460bb
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 10:56:48 +02:00
Laurent Destailleur
b8df049f95
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-31 08:11:18 +02:00
Laurent Destailleur
67a6313487
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-31 08:02:53 +02:00
Laurent Destailleur
aa42531e20
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-30 23:53:41 +02:00
Laurent Destailleur
9c049e73af
Fix: Support pages were not independants.
2013-05-30 23:53:12 +02:00
Francis Appels
62bd20ad1b
Fix: translations
...
Fixed some (auto)translations. Merged with nl_BE, browser detects nl_NL in Belgium.
2013-05-30 23:52:45 +02:00
Francis Appels
43c2bbd664
Completed missing keys + corrections
...
Added missing keys and language corrections
2013-05-30 23:31:05 +02:00
Laurent Destailleur
3601cd13dd
Merge pull request #1004 from viniciusvgn/develop
...
Translation pt-BR
2013-05-30 13:42:19 -07:00
Laurent Destailleur
0a4ca5a0b8
Merge pull request #1005 from GPCsolutions/pgsql
...
Fix install with PostgreSQL
2013-05-30 13:42:11 -07:00
Laurent Destailleur
361e291d2d
Fix: Lang not loaded
2013-05-30 19:36:00 +02:00
Laurent Destailleur
d3bcaa72bc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-30 19:33:45 +02:00
Laurent Destailleur
5fd09b68db
Fix: Support pages were not independants.
2013-05-30 19:29:08 +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
Marcos García
f6057bd794
Reverting PR #1002
...
Incorrect translation that shouldn't have been accepted
2013-05-30 16:48:04 +02:00
Raphaël Doursenaud
53fdc3b514
Fix install with PostgreSQL
...
The language should be lowercase and unquoted
2013-05-30 16:31:27 +02:00
Vinicius Nogueira
d163c95e02
Translation pt-BR
...
Updated file with phrases that were missing and improvements in the
translation.
2013-05-29 22:35:41 -03:00
Laurent Destailleur
e6bca3c549
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-29 22:42:48 +02:00
Laurent Destailleur
7413e33599
Fix: Bad page code
2013-05-29 22:41:57 +02:00
Laurent Destailleur
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
Laurent Destailleur
d1d329a6a2
Fix: Navigation into supplier invoices
2013-05-29 21:20:04 +02:00
Laurent Destailleur
4fa99a86ed
Fix: Bad permissions
2013-05-29 21:18:21 +02:00
Laurent Destailleur
b36a10babf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-29 21:05:48 +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
70e77269f6
Merge pull request #1001 from lrq3000/develop
...
Add Invoice hook in orderstoinvoice.php + Standardization
2013-05-29 08:33:15 -07:00
Florian Henry
8b2dc49734
update trans
2013-05-29 16:06:04 +02:00
Florian Henry
eb6e6ecc71
update trans
2013-05-29 16:05:35 +02:00
Florian Henry
7ab46b8e7b
add translation
2013-05-29 15:59:16 +02:00
Florian Henry
b563877f5a
Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from
...
assodolibarr@gmail.com
2013-05-29 15:56:32 +02:00
Laurent Destailleur
3fc8de8dde
Fix: Navigation into supplier invoices
2013-05-29 15:56:18 +02:00
Laurent Destailleur
e6c93424ce
Qual: Normalized tabs
2013-05-29 15:41:59 +02:00
Laurent Destailleur
60498f2692
Fix: Bad permissions
2013-05-29 13:31:57 +02:00
Stephen L
3b9af82c39
Add Invoice hook in orderstoinvoice.php + Standardization
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2013-05-29 13:28:44 +02:00
Laurent Destailleur
832bd0a89e
Merge pull request #1000 from viniciusvgn/develop
...
Translation pt-BR
2013-05-29 00:23:38 -07:00
Vinicius Nogueira
15e663ae15
Translation pt-BR
...
Updating translation files pt-BR
2013-05-28 23:07:08 -03:00
Laurent Destailleur
b2600e8880
Fix: Missing trans
2013-05-29 02:20:30 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d
Fix: But siwtiching to auguria menu.
2013-05-29 01:24:57 +02:00
Laurent Destailleur
9ab8f4c6a3
Merge pull request #998 from FHenry/develop
...
Develop
2013-05-28 15:23:29 -07:00
Laurent Destailleur
6d2db1c09f
Merge pull request #977 from cbattarel/3.3
...
[ bug #806 ] Tasks are ordered alphabetically instead of chronological order
2013-05-28 15:14:02 -07:00
Laurent Destailleur
b87350e2d6
Merge pull request #994 from defrance69/patch-13
...
Update modSociete.class.php
2013-05-28 15:09:45 -07:00
Laurent Destailleur
44ac4ade0e
Merge pull request #991 from defrance69/patch-10
...
Update contrat.class.php
2013-05-28 15:00:21 -07:00
Florian Henry
8a726ab51b
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-28 21:51:11 +02:00
Florian Henry
7c56da05b8
Add hook on propal/order/incoive list
2013-05-28 18:35:15 +02:00
Laurent Destailleur
09caa526ea
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-28 18:28:01 +02:00
Florian Henry
23c25066d3
Change comment on dol_include_once
2013-05-28 17:54:55 +02:00
Florian Henry
3ddb410e2e
Change comment on dol_include_once method
2013-05-28 17:53:56 +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
simnandez
0219242484
Fix: Trad categories more accurate
2013-05-28 15:20:14 +02:00
simnandez
485c7bc477
Fix: Trad categories more accurate
2013-05-28 15:19:24 +02:00
Laurent Destailleur
dc7b4ebc79
Fix: But siwtiching to auguria menu.
2013-05-28 13:54:29 +02:00
BENKE Charles
20d1a89c07
Update contrat.class.php
...
Add get_element_list function for return list of element (intervention linked to the contract)
2013-05-28 10:05:49 +02:00
simnandez
05aa11fce0
[ bug #914 ] It is not possible to validate a supplier invoice
2013-05-28 09:29:11 +02:00
simnandez
0c62942f03
[ bug #914 ] It is not possible to validate a supplier invoice
2013-05-28 09:28:31 +02:00
Laurent Destailleur
4c3dcec7b8
Sync with transifex: After this commit, all langs files use same order
...
of keys than source file (en_US).
Note: Please continue to prefer commiting your change into language
files into git. For the moment transifex does not support conflict
management, diff, versionning, ...
2013-05-27 23:53:06 +02:00
Laurent Destailleur
2c1e293d96
Sync lang files
2013-05-27 23:05:33 +02:00
Laurent Destailleur
5090cfee54
Fix: Clear of list broken
2013-05-27 16:12:33 +02:00
Laurent Destailleur
f1484b8448
Fix: Clear of list broken
2013-05-27 16:03:10 +02:00
Laurent Destailleur
b61ca887d5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/cache.manifest
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-05-27 12:57:57 +02:00
Laurent Destailleur
37119e70f1
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-27 12:52:11 +02:00
Laurent Destailleur
dee7ac2823
Add missing lang files
2013-05-27 12:02:31 +02:00
Laurent Destailleur
d8cef10ea3
Make comment generic for all files
2013-05-27 10:38:50 +02:00
Laurent Destailleur
c955a274ed
Merge pull request #990 from open-minds/develop
...
Minor fixes
2013-05-27 00:29:57 -07:00
Laurent Destailleur
c5737e214b
Synchro with transifex
2013-05-26 20:08:09 +02:00
Laurent Léonard
dc783ed06e
Fix typo in admin french language file
2013-05-26 19:59:57 +03:00
Laurent Léonard
20de960a95
Fix typo in contracts language file name
2013-05-26 19:36:24 +03:00
Laurent Léonard
919a34787e
Fix [ bug #895 ] Description is lost when adding a new predefined product to a contract
2013-05-26 16:30:22 +02:00
Laurent Destailleur
402f392fde
Second pull, push
2013-05-26 15:55:19 +02:00
Laurent Destailleur
4be5ffc937
Fix: Syntax error
2013-05-26 15:38:17 +02:00
Laurent Destailleur
c041774950
Trans: First try to commit files pulled from transifex.
2013-05-26 15:37:50 +02:00
Florian Henry
f543f00024
Fix PGSQL Bugs
...
Removing parenthesis make query works for MySQL and PgSQL
2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222
Fix [ bug #911 ] Reorder intervention do not work
2013-05-26 10:15:43 +02:00
zcattacz
407639fcde
Update translation
...
- all 'invoice's are changed to bill, since there is no real equivalence in Simplified Chinese.
Invoice is issued before payment, but Chinese 'invoice/FaPiao' is a state printed RECEIPT issued only after payment. Regarding the function of the invoice module, 'Bill/ZhangDan' in Chinese seems by far best understood by most ppl.
2013-05-26 14:36:01 +08:00
Laurent Destailleur
2005ce8d6e
Fix: Error with jmobile
2013-05-26 05:02:46 +02:00
Laurent Destailleur
418933e246
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-26 05:01:54 +02:00
Laurent Destailleur
f3f4dec96e
Fix: Error with jmobile
2013-05-26 05:01:28 +02:00
Laurent Destailleur
f054032e79
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-26 04:06:34 +02:00
Laurent Destailleur
268c1cfa29
Fix: Removed useless file (not correctly defined) to avoid cache
...
problems
2013-05-26 03:57:34 +02:00
Florian Henry
557756058f
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
...
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41
2013-05-25 20:58:02 +02:00
Laurent Destailleur
15402b9286
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-25 20:43:31 +02:00
Laurent Destailleur
e3e00b034b
Fix: Dir with linked files was not renamed when invoices was renamed
...
with its final ref (linked files were lost)
Fix: Ref visible into message was wrong.
Fix: Bad counting of product/service available
2013-05-25 20:43:01 +02:00
Florian Henry
c61f7b6390
Fix [ bug #911 ] Reorder intervention do not work
2013-05-25 19:48:49 +02:00
Regis Houssin
309f59fb00
Fix: wrong field name
2013-05-25 19:03:16 +02:00
Regis Houssin
b9695ddc2b
Fix: wrong field name
2013-05-25 19:02:06 +02:00
Laurent Destailleur
9ffbed07fe
Fix: More consistent fix
2013-05-25 18:16:13 +02:00
Laurent Destailleur
2cac1f4c9c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2013-05-25 18:14:15 +02:00
Laurent Destailleur
8fa9a60bc6
Fix: Bad field size
2013-05-25 18:12:07 +02:00
Laurent Destailleur
2a96172294
Fix: Pb in synchro update
2013-05-25 18:12:00 +02:00
Laurent Destailleur
f16026b79c
Fix: cyclic updates
2013-05-25 18:11:54 +02:00
Laurent Destailleur
99c657255e
Fix: Bug erase member data
2013-05-25 18:11:42 +02:00
Laurent Destailleur
1bab0f9f58
Fix: Bad field size
2013-05-25 18:10:55 +02:00
Laurent Destailleur
44268903a0
Fix: Pb in synchro update
2013-05-25 18:01:50 +02:00
Laurent Destailleur
c36f8a0149
Fix: cyclic updates
2013-05-25 17:28:31 +02:00
Laurent Destailleur
8e1feba425
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-25 17:15:17 +02:00
Laurent Destailleur
06f6f48147
Fix: Bug erase member data
2013-05-25 17:14:56 +02:00
Florian Henry
8656a9f417
Fix [ bug #895 ] Description is lost when adding a new predefined
...
product to a contract
2013-05-25 16:50:55 +02:00
Christophe Battarel
b8c51e3760
sort tasks by start date
2013-05-25 11:49:05 +02:00
Laurent Destailleur
7b13be4653
Merge pull request #978 from atm-maxime/3.4
...
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
2013-05-25 01:59:15 -07:00
Laurent Destailleur
e8f72fd401
Merge pull request #979 from defrance69/patch-9
...
Update modFournisseur.class.php
2013-05-25 01:52:30 -07:00
Florian Henry
5b02a3a67c
Fix search product if multilingue
2013-05-24 22:44:26 +02:00
Florian Henry
0a041a7705
Fix multilangue search product list
2013-05-24 22:39:28 +02:00
Laurent Destailleur
7b29e58760
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
2013-05-24 19:07:20 +02:00
Laurent Destailleur
701d8485ef
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-24 19:00:16 +02:00
Laurent Destailleur
eecfbf9670
Fix: Bad link if not supplier defined for product
2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4
Fix: Missing translation
2013-05-24 18:53:28 +02:00
Laurent Destailleur
b9f5c15542
Fix: Bad link if not supplier defined for product
2013-05-24 18:49:40 +02:00
Laurent Destailleur
c97d1cb15b
Try a fix for some browsers
2013-05-24 18:29:59 +02:00
Laurent Destailleur
6e634eb722
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-24 18:24:17 +02:00
Laurent Destailleur
92a7037c1d
Fix: Missing translation
2013-05-24 18:20:28 +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
7bbdae239f
Fix: Removed errors with not defined vars
2013-05-24 14:32:12 +02:00
Maxime Kohlhaas
f66750d5e7
Fix : Reset every month with @99 was not working properly (for 3.4 branch)
2013-05-24 11:23:56 +02:00
Christophe Battarel
b89b7405f8
update function comments header
2013-05-23 22:54:06 +02:00
Christophe Battarel
b96bff4770
[ bug #806 ] Tasks are ordered alphabetically instead of chronological order
2013-05-23 22:51:27 +02:00
Laurent Destailleur
e9f964978d
Merge pull request #974 from cbattarel/develop
...
fix bug when creating fichinter from order
2013-05-23 12:50:32 -07:00
Laurent Destailleur
6270a2e23c
Try a fix for some browsers
2013-05-23 19:29:39 +02:00
Christophe Battarel
ebb8171d28
fix bug when creating fichinter from order (create function should receive $user as parm)
2013-05-23 11:36:00 +02:00
Maxime Kohlhaas
53c6638a90
Reset every month with @99 was not working properly.
2013-05-23 11:07:56 +02:00
Laurent Destailleur
ee84457104
Fix: not defined default value
2013-05-23 10:04:35 +02:00
Laurent Destailleur
3b6c55f908
Fix: Param was renamed
2013-05-22 17:29:25 +02:00
Lukas Prömer
bb42f8384b
Fix: 'rights' instead of 'right'
2013-05-22 16:31:50 +02:00
Laurent Destailleur
7856b7f613
Removed warning
2013-05-22 15:52:26 +02:00
Lukas Prömer
f1d9a6545c
Fix: 'rights' instead of 'right'
2013-05-22 14:59:21 +02:00
Laurent Destailleur
469ae91e70
Fix: regression
2013-05-22 12:02:39 +02:00
Laurent Destailleur
d5d4bc33ba
Merge pull request #971 from cbattarel/3.3
...
fix wrong construction of description when creating from orders
2013-05-22 02:57:34 -07:00
Laurent Destailleur
edf00db0e0
Merge pull request #970 from FHenry/develop
...
Add generic behaviour in showphoto of html.form.class.php
2013-05-22 02:57:21 -07:00
Laurent Destailleur
1109527528
Merge pull request #968 from FHenry/3.3
...
3.3
2013-05-22 02:56:06 -07:00
Laurent Destailleur
f6f93eeec0
Merge pull request #967 from cbattarel/develop
...
add ability to include products on intervention card
2013-05-22 02:55:55 -07:00
Laurent Destailleur
f21b149361
Merge pull request #969 from FHenry/3.4
...
Fix bug in DDLCreateTable
2013-05-22 02:55:26 -07:00
simnandez
8d9b1e4788
Fix: Show date formatted
2013-05-22 10:51:45 +02:00
Christophe Battarel
992600664e
fix wrong construction of description when creatin from orders (it was putting a mess on update)
2013-05-22 10:29:31 +02:00
Christophe Battarel
c69a44d6e9
fix wrong construction of description when creatin from orders (it was putting a mess on update)
2013-05-22 10:23:26 +02:00
Laurent Destailleur
961ce6e3e2
Fix: Removed error blocking redirect
2013-05-21 19:53:10 +02:00
fhenry
40827a7ef3
Add generic behaviour in showphoto of html.form.class.php
2013-05-21 14:52:39 +02:00
Laurent Destailleur
8fe45b1af6
Manifest usage is useless for a dynamic application like dolibarr.
2013-05-21 14:41:11 +02:00
fhenry
b36a16ed43
Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1
2013-05-21 14:32:30 +02:00
fhenry
13ad88832c
Fix bug in DDLCreateTable
2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a
Fix bug on DDLCreateDb in Mysql
2013-05-21 14:28:42 +02:00
Christophe Battarel
c97384d5db
restore UNIX type (LF)
2013-05-21 12:32:41 +02:00
Christophe Battarel
4b1ae9e9a9
add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant)
2013-05-21 11:44:11 +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
4539f6ce58
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-20 19:26:24 +02:00
Laurent Destailleur
6db07ac2d8
Fix: Several bugs into filter on statistics pages.
2013-05-20 19:24:27 +02:00
simnandez
1470b75e5c
Trad: Fix Catalan words into Spanish
2013-05-20 18:44:41 +02:00
simnandez
3f1dabb4e2
Trad: Fix Catalan words into Spanish
2013-05-20 18:43:21 +02:00
Laurent Destailleur
53c053604f
Merge pull request #966 from FHenry/3.4
...
Fix bug on service date strat date end in propal line not recorded
2013-05-20 09:02:15 -07:00
fhenry
250b6d6502
Fix bug on service date strat date end in propal line not recorded
2013-05-20 17:58: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
Laurent Destailleur
e00df58153
Merge pull request #965 from grandoc/3.4
...
fix: wrong trad
2013-05-20 07:46:26 -07:00
Laurent Destailleur
416cdd2f9c
Merge pull request #956 from cbattarel/3.3
...
fix bug : external users should not see costprice and margin infos
2013-05-20 07:39:39 -07:00
Grand Philippe
5f714f1403
fix: wrong trad
2013-05-20 14:39:27 +02:00
Christophe Battarel
f8ca842685
fix typo error
2013-05-20 10:10:34 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
fhenry
3d409390a5
Revert Class rewrite and ficheinter line trigger
2013-05-19 18:37:38 +02:00
fhenry
6407139b04
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-19 18:28:43 +02:00
fhenry
71107f8dca
Triggger ficheinter line
2013-05-19 18:28:27 +02:00
Laurent Destailleur
2ac738d8c4
Merge pull request #955 from FHenry/3.4
...
Fix error management and SQL resquest in action comm
2013-05-19 09:02:00 -07:00
fhenry
a6233a738c
Fix trigger in deleteline fiche inter
2013-05-19 14:13:41 +02:00
Christophe Battarel
347fc6d714
fix unauthorized access to margins for external user
2013-05-19 14:04:21 +02:00
Marcos García
0a5bb491d3
Corrected translation key BuyingPrice from lang files
2013-05-19 12:24:19 +02:00
Juanjo Menent
afddded13c
Merge pull request #962 from marcosgdf/translations
...
Corrected translation key BuyingPrice from lang files
2013-05-19 03:22:54 -07:00
Marcos García
4318d5c02d
Missing succes message in margin module config page
2013-05-19 12:19:31 +02:00
Marcos García
5f4433dbff
Missing succes message in margin module config page
2013-05-19 12:09:34 +02:00
Marcos García
08b234ed01
Corrected translation key BuyingPrice from lang files
2013-05-19 12:08:18 +02:00
fhenry
c07d5045d1
Error management
2013-05-19 11:55:03 +02:00
Juanjo Menent
a7e0f8cb8e
Merge pull request #958 from atm-maxime/develop
...
Add mobile phone in contact export
2013-05-19 02:54:44 -07:00
fhenry
6190dddac9
GetElmentURL fichinter instead of ficheinter (to be ok with element of
...
fichinter class
2013-05-19 11:30:35 +02:00
fhenry
94e2ea05d2
Fix trigger ficheinterline
2013-05-19 11:18:45 +02:00
fhenry
a8e1d111c3
Add trigger into ficheinter lines and $user pass trought parameters
...
every where
2013-05-19 10:26:25 +02:00
fhenry
181ce52223
Add ficheinter in GetElementURL for action
2013-05-18 22:17:46 +02:00
fhenry
cbf29e20a2
[ task #901 ] Add Extrafeild on Fiche Inter
2013-05-18 13:00:36 +02:00
fhenry
5d73ce4023
[ task #901 ] Add Extrafeild on Fiche Inter
2013-05-18 12:53:11 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
simnandez
eb7254cccb
Fix: Remove windows CR/LF
2013-05-18 09:19:03 +02:00
simnandez
e2f2ad30ae
Fix: Remove windows CR/LF
2013-05-18 09:15:18 +02:00
simnandez
2879a09a03
Fix: Remove windows CR/LF
2013-05-18 09:11:24 +02:00
fhenry
7a6a74f43e
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-17 21:35:11 +02:00
fhenry
e19e9e1c63
Add dol_syslog
2013-05-17 21:27:15 +02:00
fhenry
1eddd86950
Fix Bad Formed Request PGSQL
2013-05-17 21:20:02 +02:00
fhenry
1c1736fa20
Fix bad Warning: Bad formed request converted PGSQL
2013-05-17 19:30:48 +02:00
Maxime Kohlhaas
57212d7db8
Add mobile phone in contact export
2013-05-17 17:29:41 +02:00
Christophe Battarel
7efe39495a
french translation for CostPrice
2013-05-17 15:18:50 +02:00
Christophe Battarel
e3615d43bd
fix bug : external users should not see costprice and margin infos
2013-05-17 15:02:27 +02:00
fhenry
5acdbfa8f0
Fix error management and SQL resquest in action comm
2013-05-17 14:45:54 +02:00
Laurent Destailleur
bd92adf092
Better trans
2013-05-17 11:20:44 +02:00
Grand Philippe
f7f59f962b
missing translation for script
2013-05-17 10:35:42 +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
Juanjo Menent
38e1ff6f59
Merge pull request #952 from aponzio/develop
...
Fixed odd translation
2013-05-17 00:45:35 -07:00
Laurent Destailleur
fdd8d2cc5e
Fix: to large a href
2013-05-17 01:30:39 +02:00
Laurent Destailleur
b8cd276128
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-17 00:48:02 +02:00
Laurent Destailleur
b3adbf53e5
Fix data for greece
2013-05-17 00:47:50 +02:00
Laurent Destailleur
393ad1447a
Qual: Uniformize permission code between viewimage.php and document.php
2013-05-16 15:46:54 +02:00
Laurent Destailleur
bab4e1e509
Fix: PHP version was lost
...
Fix: split of long text to avoid horizontal scrolls
2013-05-16 15:15:30 +02:00
Laurent Destailleur
658f0af428
Fix: Removed warning
2013-05-16 15:13:08 +02:00
Laurent Destailleur
ad5a350073
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-16 15:06:13 +02:00
Laurent Destailleur
37fa25c1ab
Fix: PHP version was lost
...
Fix: split of long text to avoid horizontal scrolls
2013-05-16 15:02:26 +02:00
Laurent Destailleur
bae17bc39b
Fix: Removed warning
2013-05-16 12:37:46 +02:00
Alessandro Ponzio
03a2b4e5c9
Fixed odd translation
...
Improved translation of entry for the project tabs ("Contatti" instead of "Progetto contatti")
2013-05-16 12:33:03 +02:00
Laurent Destailleur
fb92e13650
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-05-15 22:35:41 +02:00
Laurent Destailleur
ff94849b0c
Fix: Security test
2013-05-15 19:57:51 +02:00
Laurent Destailleur
bbb843ec58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925
New: Add balance before and after column
2013-05-15 19:30:32 +02:00
simnandez
2981d4a1ec
Fix: Remove windows CR/LF
2013-05-15 18:14:37 +02:00
Laurent Destailleur
49735b8d39
New: Add option "filter=bank" onto script rebuild_merge_pdf.php to
...
merge PDF that has one payment on a specific bank account.
2013-05-15 17:52:56 +02:00
Laurent Destailleur
626362780a
Fix: Remove not used constant
2013-05-15 17:30:18 +02:00
fhenry
721e074072
Better wulity code for Task 532
2013-05-15 14:25:33 +02:00
fhenry
be525ad0e8
Better code quality for [ task #531 ] Add a duration on tasks
2013-05-15 14:19:16 +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
96dc851161
Doxygen
2013-05-15 13:24:18 +02:00
Laurent Destailleur
3a11e0baad
New: Script export-bank-receipts should be ready for test.
2013-05-14 23:59:59 +02:00
Laurent Destailleur
f6dfcb756c
Text cells must be left align into excel 2007 export.
2013-05-14 23:54:22 +02:00
Laurent Destailleur
d92b46c9f9
Fix: Label missing
...
Fix: Cancel not working
2013-05-14 23:41:57 +02:00
Laurent Destailleur
da4f13f387
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-14 23:40:51 +02:00
Laurent Destailleur
fe9e8aab5e
Fix: Label missing
...
Fix: Cancel not working
2013-05-14 23:39:17 +02:00
fhenry
b280bff809
Update comments0
2013-05-14 20:33:56 +02:00
fhenry
7de861eee4
Beteer display
2013-05-14 20:30:18 +02:00
fhenry
6727ab34ed
Review style hideonsmartphone
2013-05-14 20:25:34 +02:00
fhenry
d0b4cef7a4
Change duration _planned by planned_workload
2013-05-14 20:22:33 +02:00
Regis Houssin
047aa8ea29
Fix: avoid error when multiple files uploaded
2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b
Fix: avoid error when multiple files uploaded
2013-05-14 15:58:59 +02:00
Regis Houssin
179fc0a4cb
Fix: avoid error when multiple files uploaded
2013-05-14 15:58:20 +02:00
Laurent Destailleur
551bcba826
Fix: Try to avoid warning
2013-05-14 10:51:09 +02:00
fhenry
f98442d700
Remove the option into admin screen
2013-05-14 09:24:05 +02:00
Laurent Destailleur
f9e0d03b0c
Fix: Do not show busy if event not assigned to a user.
2013-05-14 02:46:00 +02:00
Laurent Destailleur
d7e9236455
Fix: Missing include
2013-05-14 01:31:04 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
95fac9aace
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-14 01:08:58 +02:00
Laurent Destailleur
83b35b5b64
Merge pull request #950 from aponzio/develop
...
Translateded missing entries "ThirdPartiesOfSaleRepresentative"
2013-05-13 16:08:27 -07:00
Laurent Destailleur
0d54294bcf
Merge pull request #949 from marcosgdf/holidays-module
...
Improvement to holidays module
2013-05-13 16:07:56 -07:00
Laurent Destailleur
dc28335ed5
Merge pull request #948 from marcosgdf/translations
...
Improved translations
2013-05-13 16:07:22 -07:00
Laurent Destailleur
3898a77da1
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-14 01:05:18 +02:00
Laurent Destailleur
656f0bee70
Merge pull request #947 from grandoc/3.4
...
fix: center bloc was going under left menu
2013-05-13 16:05:06 -07:00
Laurent Destailleur
80817fd8fb
Fix: translation
2013-05-14 01:04:21 +02:00
Laurent Destailleur
d5cc106a3a
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-14 01:04:10 +02:00
Laurent Destailleur
cc20b000df
Merge pull request #945 from zcattacz/translation
...
zh_cn/admin.lang reworkred
2013-05-13 15:46:32 -07:00
Laurent Destailleur
ea4b324e25
Merge pull request #943 from defrance69/patch-7
...
Update dolgraph.class.php
2013-05-13 15:41:36 -07:00
Laurent Destailleur
559bbdf19a
Merge pull request #944 from defrance69/patch-8
...
Update annuel.php
2013-05-13 15:40:43 -07:00
Laurent Destailleur
273fbdfa0e
Merge pull request #942 from FHenry/3.4
...
Remove warning if FetchObjectLinked call
2013-05-13 15:38:28 -07:00
Laurent Destailleur
0eba9ed731
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-14 00:13:53 +02:00
Laurent Destailleur
03cbe6e208
Fix: Can't read link with some styles
2013-05-13 23:46:37 +02:00
simnandez
0c853b3ebd
Fix: Some bugs on withdrawal rejects
2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee
Fix: Some bugs on withdrawal rejects
2013-05-13 17:15:23 +02:00
fhenry
760ae88f39
[ task #531 ] Add a duration on tasks
2013-05-13 17:08:36 +02:00
simnandez
050ca946e9
Fix: Debug of withdrawals rejects
2013-05-13 16:30:52 +02:00
zcattacz
b911afcddb
revised
...
- unify the usage of full/half-width punctuations characters.
- chk chk
2013-05-13 22:10:42 +08:00
Alessandro Ponzio
e0365ac900
Translateded missing entry "ThirdPartiesOfSaleRepresentative"
2013-05-13 11:57:20 +02:00
Alessandro Ponzio
e1b4cdb7e3
Translateded missing entry "LinkedToSpecificUsers"
2013-05-13 11:55:51 +02:00
Laurent Destailleur
2c05d99742
Qual: Uniformize code
2013-05-12 20:10:16 +02:00
Laurent Destailleur
4fc1fe798c
Fix: Bad check on mandatory parameters
2013-05-12 18:20:28 +02:00
fhenry
757c22a204
Fix bug intervention numbering on validation
2013-05-12 17:54:30 +02:00
fhenry
a78b3149fe
Remove debug lines
2013-05-12 17:15:45 +02:00
Laurent Destailleur
df6c796413
Fix: [ bug #889 ] Titre civilité ne s'affiche
2013-05-12 17:09:48 +02:00
Laurent Destailleur
d9e477d748
Fix: Civility translation
2013-05-12 16:38:38 +02:00
fhenry
111fc3153b
Fix Extrafield selllist bug in PgSQL
2013-05-12 15:45:23 +02:00
Laurent Destailleur
1e76911890
Fix: Not error when migrating from version using exotic menu manager.
...
Fix: Delete of member use id
2013-05-12 15:26:23 +02:00
Laurent Destailleur
7c543d0c2a
Fix: Not error when migrating from version using exotic menu manager.
...
Fix: Delete of member use id
2013-05-12 15:25:12 +02:00
Marcos García
a37392e34e
Removed conflict with margins module name and description (already set in admin.lang)
2013-05-12 12:19:26 +02:00
Marcos García
62475866e3
Style improvements and fixed a "bug" that showed "()" when no note was entered
2013-05-12 12:06:45 +02:00
fhenry
9bfb22ad49
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-12 11:46:53 +02:00
Marcos García
dcb6bb4c2e
Improvement to holidays module
...
Creation date can't be higher than today
2013-05-12 11:38:17 +02:00
Marcos García
c61f48a98f
Added missing translation in holidays module
2013-05-12 11:36:49 +02:00
zcattacz
a25fe2e59d
Adjust word order
2013-05-12 16:42:43 +08:00
simnandez
dbb0fa09ff
Fix: Debug of withdrawals rejects
2013-05-11 18:36:44 +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
Grand Philippe
23a24909e3
fix: center bloc was going under left menu
2013-05-11 17:00:47 +02:00
fhenry
ccb60e549a
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-11 15:48:49 +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
Laurent Destailleur
711e7bf9ad
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/adherents/fiche.php
htdocs/core/lib/functions.lib.php
2013-05-11 15:18:52 +02:00
Laurent Destailleur
8a90598b23
Fix: Escape entities
2013-05-11 15:12:42 +02:00
Laurent Destailleur
e4dda125d8
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-05-11 15:04:56 +02:00
Laurent Destailleur
526a80dd20
Sec: Param not escaped
...
Fix: Bad return error
2013-05-11 15:04:17 +02:00
zcattacz
a00f298f22
Chinese transaltion reworked for admin.lang
...
- unsure translation start with *
- unused translation (by me) revert to English string
the original machine translation is barely readable :(
2013-05-11 14:02:50 +08:00
Laurent Destailleur
8717b1dd3c
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-11 02:16:06 +02:00
Laurent Destailleur
fa4fc8495b
Fix: Missing translation key
...
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
2013-05-11 02:12:34 +02:00
BENKE Charles
ea130724b1
Update annuel.php
...
Add Debt and Cred graphic at the bottom of the page
2013-05-10 23:16:41 +02:00
BENKE Charles
4f28c3dd41
Update dolgraph.class.php
...
jflot can't manage more than 2 bars but can manage more than 3 lines.
2013-05-11 00:13:27 +03:00
fhenry
1a7a8817be
Update wrong comment
2013-05-10 18:40:19 +02:00
fhenry
0d13b8d194
Fix previous bug
2013-05-10 18:35:19 +02:00
fhenry
4bb6bd8697
Order result fetchObjectLinked by sourcetype
2013-05-10 18:23:13 +02:00
fhenry
3a05d6c641
Remove warning if FetchObjectLinked call
2013-05-10 17:50:14 +02:00
simnandez
d228005e17
Fix: Remove windows CR/LF
2013-05-10 17:43:55 +02:00
fhenry
8542a4fd28
Fix date extrafield message old datetimeformat use message in log
2013-05-10 16:34:14 +02:00
Laurent Destailleur
d1d9a65de5
Merge pull request #940 from aponzio/develop
...
Fixed odd translation
2013-05-10 07:31:44 -07:00
fhenry
cdc1e55b26
Fix bug on Extrafield order and propal
2013-05-10 15:39:54 +02:00
fhenry
aab3e0a8a5
Fix Extrafield problem on propal pages
2013-05-10 15:33:28 +02:00
fhenry
0a26be3f04
Fix security leak
2013-05-10 15:11:49 +02:00
fhenry
9427e32e2e
Fix security breach (SQL injection)
2013-05-10 15:04:16 +02:00
fhenry
358f051b8e
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-10 14:53:13 +02:00
Alessandro Ponzio
0817d035a3
Updated SQL query that fetches invoices by adding the 'ORDER BY' clause
2013-05-10 14:38:15 +02:00
Laurent Destailleur
9b30f116f1
Fix: Some lib missing when jmobile enabled.
2013-05-10 12:48:11 +02:00
fhenry
a4e8e8eb4b
Add fecth extrafield into fetch user class
2013-05-10 12:03:27 +02:00
Alessandro Ponzio
a5199962f3
Fixed odd translation
2013-05-10 08:16:36 +03:00
Alessandro Ponzio
3666999c37
Fixed bug in jsgantt.js showing 'NaN' when start/end date were missing
2013-05-10 07:10:05 +02:00
Laurent Destailleur
ce6e1dc2a6
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-09 23:35:04 +02:00
Laurent Destailleur
e5ef27b168
Fix: no underline onto link that are disabled.
2013-05-09 22:43:01 +02:00
Laurent Destailleur
cc500cceba
Fix: form into table is not W3C (broken with some uncommon browsers).
2013-05-09 22:39:31 +02:00
Alessandro Ponzio
d7527b68da
Fixed odd translation
...
Improved translation of general-purpose entry ("Trimestre" instead of "Quadri")
2013-05-09 19:03:40 +02:00
fhenry
30fb1e5e05
Fix bug [ bug #885 ] silent pgsql errors with click2dial
2013-05-09 10:26:04 +02:00
simnandez
7358faeb96
New: [ task #812 ] Add more Scripts. expire contract services ordered by
...
date end
2013-05-09 09:41:32 +02:00
simnandez
1af8057158
Trad: Spanish predefined mail content still more friendly
2013-05-08 18:50:30 +02:00
simnandez
191fc8eb45
Trad: Added missing translations
2013-05-08 18:04:22 +02:00
simnandez
bbb4fcad28
Trad: Added missing translations
2013-05-08 18:00:15 +02:00
simnandez
5e059fb15d
Trad: Added missing translations
2013-05-08 17:59:16 +02:00
Marcos García
e86a742383
Added missing translations
2013-05-08 17:56:32 +02:00
Juanjo Menent
278d2c6cb1
Merge pull request #935 from marcosgdf/translations-develop
...
Corrected translations of info tooltips in document models description
2013-05-08 08:54:44 -07:00
simnandez
a91dc0e32a
Trad: Spanish predefined mail content more friendly
2013-05-08 17:52:08 +02:00
Marcos García
e18eb3a6b3
Added missing translations
2013-05-08 17:20:20 +02:00
Marcos García
edfcfb9bbd
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
...
Conflicts:
htdocs/admin/commande.php
htdocs/admin/expedition.php
htdocs/admin/facture.php
htdocs/admin/fichinter.php
htdocs/admin/livraison.php
htdocs/admin/supplier_invoice.php
htdocs/admin/supplier_order.php
htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
simnandez
b9583d389e
Trad: Add products missing translations
2013-05-08 12:24:50 +02:00
simnandez
bf043fc845
Fix: Remove windows CR/LF
2013-05-08 09:28:05 +02:00
Laurent Destailleur
9c0839074c
Merge pull request #931 from marcosgdf/translations
...
Improved translations
2013-05-08 00:13:10 -07:00
Laurent Destailleur
28c4f9af61
Merge pull request #933 from FHenry/3.4
...
Make constraint SQL unique name (Mandatory for PgSQL)
2013-05-08 00:12:54 -07:00
Laurent Destailleur
19f49971bb
Merge pull request #930 from marcosgdf/utf-8
...
Converted recent changes to UTF-8 encoding
2013-05-08 00:12:36 -07:00
Laurent Destailleur
68f3a634b6
Merge pull request #932 from marcosgdf/minor
...
Removed innecesary whitespace when no picto is displayed
2013-05-08 00:11:58 -07:00
Laurent Destailleur
fc158d1e10
Merge pull request #934 from KreizIT/develop
...
Fix invalid permission test when deleting services
2013-05-08 00:11:01 -07:00
Marcos García
3d5cb4e8de
Style improvements in model document selector
2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72
Corrected translations of info tooltips in document models description
2013-05-07 22:04:08 +02:00
fhenry
8c37063541
Fix bug [ bug #881 ] some errors
2013-05-07 18:59:28 +02:00
simnandez
46c1b87b32
New: [ task #812 ] Add more Scripts. expire contract services to
...
representatives and customers
2013-05-07 17:43:54 +02:00
fhenry
68259c51eb
Fix [ bug #886 ] Silent pgsql errors in
...
/fourn/commande/fiche.php?action=create
2013-05-07 17:09:31 +02:00
fhenry
37a9686921
Fix bug [ bug #884 ] Warnings on /compta/bank/index.php
2013-05-07 17:06:10 +02:00
fhenry
207f6cea28
Fix [ bug #883 ] Silent pgsql errors in comm/index.php
2013-05-07 16:59:27 +02:00
fhenry
16e06736e6
Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de
...
prélèvement
2013-05-07 16:50:27 +02:00
fhenry
de4b9b01bf
Fix Bug [ bug #880 ] Prelevement section is broken
2013-05-07 15:34:40 +02:00
fhenry
1fc693f692
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-07 15:21:10 +02:00
zcattacz
eecaa57434
Oops wrong case
2013-05-07 21:08:33 +08:00
zcattacz
ac9f5180b0
English translation minor improvement
2013-05-07 20:47:16 +08:00
fhenry
c623e7913b
Update migration script with new idx index unique name opensurvey
2013-05-07 14:31:11 +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
fhenry
f016517ed1
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-07 13:55:16 +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
ca9a2b281a
New: [ task #812 ] Add more Scripts. expire contract services to
...
representatives
2013-05-07 12:52:14 +02:00
Laurent Destailleur
c28ef8a557
Fix: Delete deprecated files during install as they create conflicts
...
when migrating from old versions.
2013-05-07 12:51:45 +02:00
fhenry
6427129480
Fix extrafields update/save on User/fiche.php
2013-05-07 12:25:32 +02:00
Cedric GROSS
d1c1cf6bc0
Fix invalid permission test when deleting services
2013-05-07 12:07:06 +02:00
simnandez
70dedc49b2
[ task #877 ] Reorganize menus. Works with auguria menu
2013-05-07 10:15:49 +02:00
fhenry
b3f40b900b
Make constraint SQL unique name (Mandatory for PgSQL)
2013-05-07 09:26:31 +02:00
Marcos García
0a90af0b99
Fixed untranslated string
2013-05-06 23:31:19 +02:00
Marcos García
c81cf6364a
Removed innecesary whitespace when no picto is displayed
2013-05-06 22:59:50 +02:00
Marcos García
20e0fe4b24
Corrected translation key
2013-05-06 22:24:05 +02:00
Marcos García
f9093e00bb
Missing es_ES translations
2013-05-06 18:14:16 +02:00
Marcos García
44ef25a367
Converted recent changes to UTF-8 encoding
2013-05-06 18:10:41 +02:00
Laurent Destailleur
fe2a160ca8
Merge pull request #926 from aponzio/develop
...
Minor fixes to language files
2013-05-06 09:05:56 -07:00
Laurent Destailleur
5efc298431
Merge pull request #915 from defrance69/patch-6
...
Update categ.php
2013-05-06 09:05:19 -07:00
Regis Houssin
3aa049b661
Fix: regression
2013-05-06 17:57:33 +02:00
Marcos García
9f537cedd1
Replaced "Jours" with DurationDays translation key
2013-05-06 17:48:20 +02:00
Marcos García
da61a24831
Missing translations
2013-05-06 17:47:53 +02:00
Marcos García
f5b04fdfe5
Stetic fix: Select was not valigned
2013-05-06 17:47:21 +02:00
Marcos García
896a60296c
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-06 17:22:31 +02:00
Juanjo Menent
0e49ec93f9
Merge pull request #929 from marcosgdf/holidays-minor
...
Minor changes in holidays module
2013-05-06 08:17:25 -07:00
Marcos García
bd9849c1aa
Fixed bug with holidays log
2013-05-06 17:15:49 +02:00
Juanjo Menent
a53e4123eb
Merge pull request #927 from marcosgdf/holidays-bug
...
Fixed bug with holidays log
2013-05-06 08:14:46 -07:00
Marcos García
bbe1db0e9f
Replaced addslashes with $this->db->escape
2013-05-06 17:13:43 +02:00
Juanjo Menent
192ef564be
Merge pull request #924 from marcosgdf/minor
...
Replaced addslashes with $this->db->escape
2013-05-06 08:12:19 -07:00
Marcos García
e1913f4a13
Stetic fix: Select was not valigned
2013-05-06 17:07:20 +02:00
Marcos García
7e11f7466a
Missing translations
2013-05-06 17:07:12 +02:00
Marcos García
05be90a220
Using month selector instead of direct input
2013-05-06 17:06:41 +02:00
Marcos García
f4973d5aa9
Holidays log now shows recent changes first
2013-05-06 17:04:21 +02:00
Marcos García
9935dad500
Wrong indentation
2013-05-06 17:04:15 +02:00
Marcos García
b830c1dd8c
Removed "event" word from event description and changed ActionTypeCP to Description
2013-05-06 17:04:04 +02:00
Marcos García
0846f4678b
User links in log view
2013-05-06 16:53:22 +02:00
Marcos García
d7a7f316d3
Replaced "Jours" with DurationDays translation key
2013-05-06 16:51:08 +02:00
Marcos García
d0635901a6
Fixed bug with holidays log
2013-05-06 16:45:03 +02:00
Juanjo Menent
d391a21a68
Merge pull request #925 from marcosgdf/task-858
...
New: [ task #858 ] Holiday module: note on manual holiday assignation
2013-05-06 07:13:59 -07:00
Marcos García
12971fa139
Corrected es_ES translations
2013-05-06 16:11:42 +02:00
Juanjo Menent
ea2109b635
Merge pull request #922 from marcosgdf/translations
...
Corrected es_ES translations
2013-05-06 07:06:01 -07:00
Juanjo Menent
c05d593a2a
Merge pull request #920 from marcosgdf/refactor
...
Removed duplicated code
2013-05-06 07:04:15 -07:00
Juanjo Menent
3bbde9b8e4
Merge pull request #918 from FHenry/develop
...
Fix margin calculation problem, and add myuser_fullname and myuser_logo
2013-05-06 07:01:38 -07:00
fhenry
0bb9ee158a
Fix trigger call ficher inter create
2013-05-06 13:47:33 +02:00
fhenry
ae4e861147
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-06 09:54:42 +02:00
fhenry
441ad8c6d0
Fix Trad Fr
2013-05-06 09:53:58 +02:00
fhenry
8bd7c6a763
Fix Trad Fr
2013-05-06 09:53:23 +02:00
aponzio
68fefb0df1
Update banks.lang
...
Improved translation of menu item ("Bonifici e giroconti" instead of "Bonifici bancari"): it makes easier to understand that you can transfer money to another of your accounts
2013-05-05 13:29:46 +03:00
aponzio
b9dcecedc0
Update sendings.lang
...
Fixed autogenerated translation
2013-05-05 13:21:41 +03:00
Marcos García
e2a73839bc
Replaced addslashes with $this->db->escape
2013-05-04 20:17:05 +02:00
Marcos García
3eb6d3edb1
Translated some comments
2013-05-04 20:09:39 +02:00
Marcos García
c21390ab83
New: [ task #858 ] Holiday module: note on manual holiday assignation
2013-05-04 20:08:17 +02:00
Marcos García
a5009fd555
Corrected es_ES translations
2013-05-04 19:35:38 +02:00
fhenry
bdb81803bd
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-04 09:06:32 +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
9e847884d1
Prepare dev branch
2013-05-03 18:41:14 +02:00
Laurent Destailleur
1c9caeb0d3
Fix: CRLF
2013-05-03 18:33:23 +02:00
Laurent Destailleur
0b228b3a87
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/user/perms.php
2013-05-03 18:33:05 +02:00
Laurent Destailleur
c8ef07a889
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750
Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql
...
(3.4-beta).
Fix: Permission tab was not visible for external users.
2013-05-03 16:10:28 +02:00
fhenry
d8f1818f86
Fix margin calculation problem, and add myuser_fullname and myuser_logo
...
into standard ODT replacement
2013-05-03 15:44:35 +02:00
fhenry
4a1eb1a588
Fix margin calculation
2013-05-03 15:26:20 +02:00
fhenry
a35a44b23e
Fix margin calculation problem
2013-05-03 15:22:41 +02:00
BENKE Charles
5c766d255f
Update categ.php
...
Add update label feature
2013-05-03 16:02:04 +03:00
Laurent Destailleur
8dcb396fb8
Merge pull request #914 from FHenry/3.4
...
fix margin calculation problem
2013-05-03 04:18:15 -07:00
Laurent Destailleur
f926ddb417
Merge pull request #913 from FHenry/develop
...
Fix bug on margin calculation (column price no more use) use total_ht/qty
2013-05-03 04:18:03 -07:00
Laurent Destailleur
b7f3f07fc7
Fix: [ bug #840 ] fichetwothirdright 65% to 55%
2013-05-03 12:13:10 +02:00
Laurent Destailleur
c850d413f4
Fix: [ bug #871 ] Erreur MAJ 3.2 -> 3.3 avec pgsql
2013-05-03 12:00:55 +02:00
fhenry
30d888c34f
Fix comment on facturedet table description
2013-05-03 11:52:21 +02:00
Laurent Destailleur
880daa4375
Fix: log file permission during install
2013-05-03 11:51:26 +02:00
fhenry
9038549d0d
fix margin calculation problem
2013-05-03 11:50:13 +02:00
fhenry
8cfbcd47ca
Fix margin calculation
2013-05-03 11:26:00 +02:00
fhenry
a38287ffdf
Deprecated column price into llx_facturedet
2013-05-03 11:16:22 +02:00
fhenry
97192510e2
Fix bug on margin calculation (column price no more use) use subprice
...
instead.
2013-05-03 11:09:58 +02:00
Laurent Destailleur
97de97de9d
Prepare branch 3.4
2013-05-03 10:17:46 +02:00
Laurent Destailleur
7382a97223
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2013-05-03 10:13:31 +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
2e4c73ebc4
Fix: Link to phone with tel: must be only onto terminal that support
...
protocol "tel:"
2013-05-03 10:06:54 +02:00
Marcos García
c65620ab62
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866
...
Conflicts:
ChangeLog
2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f
Enhanced fix
2013-05-03 08:16:31 +02: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
fhenry
f9328f4018
Propal don't move
2013-05-02 23:00:33 +02:00
fhenry
0dbc73a6cc
Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d
2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676
Merge pull request #911 from atm-maxime/develop
...
Fix : extrafields were save without escape
2013-05-02 10:43:14 -07:00
Laurent Destailleur
4687350337
Merge pull request #910 from marcosgdf/3.3-translations
...
Translation improvements + fixed statut image of returned prelevement
2013-05-02 10:42:53 -07:00
Laurent Destailleur
3a531f048a
Merge pull request #906 from grandoc/3.3
...
fix: undefined property
2013-05-02 10:42:13 -07:00
Laurent Destailleur
f595a7ed0c
Merge pull request #905 from FHenry/develop
...
Add table extrafield for commande fournisseur
2013-05-02 10:41:02 -07:00
Laurent Destailleur
fa497cf5fc
Fix: Trans and wrap
2013-05-02 18:25:27 +02:00
Laurent Destailleur
9a4cc839bb
Fix: Removed warning
...
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
2013-05-02 17:41:10 +02:00
fhenry
7e47b37ade
Fix [ bug #788 ] Date of linked interventions are not shown
2013-05-02 13:56:14 +02:00
Laurent Destailleur
26f3e920cf
Fix: Removed warning.
...
Fix: Missing doxygen
2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47
Fix : extrafields were save without escape
2013-05-02 12:14:29 +02:00
fhenry
5d60ed2462
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-01 22:57:33 +02:00
fhenry
8d6f959d31
Fix [ bug #864 ] fournisseur_extrafields
2013-05-01 22:57:03 +02:00
Marcos García
97478ccbf2
Error statut image + not translated strings
2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171
Corrected some es_ES translations and fixed problems with translations not being translated
2013-05-01 20:43:08 +02:00
Marcos García
a9e63610ae
Fixed bug #866 : Standing order from an invoice suggests invoice total amount instead of remaining to pay
2013-05-01 20:40:29 +02:00
fhenry
3b6efd569d
Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur
2013-05-01 17:09:08 +02:00
Laurent Destailleur
cbc56f8044
Fix: W3C
...
Fix: Translation
2013-05-01 16:05:52 +02:00
Laurent Destailleur
5c95018356
Fix: Avoid empty arrays
2013-05-01 16:00:06 +02:00
fhenry
ed9581f77f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-01 14:40:07 +02:00
fhenry
f3480bf502
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-01 14:38:43 +02:00
Laurent Destailleur
08b656dc0a
Look: missing top border
2013-05-01 13:40:24 +02:00
Laurent Destailleur
3daac1d7ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-01 13:35:01 +02:00
Grand Philippe
7f27801c3c
fix: Undefined property: stdClass::$xxx
2013-05-01 09:41:36 +02:00
philippe
8d844a1094
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-01 09:08:15 +02:00
Laurent Destailleur
5b85adfb90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/bank/account.php
2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d
Fix: Links when transaction is withdraw has disappeared.
2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b
Fix: Links when transaction is withdraw has disappeared.
2013-05-01 02:28:14 +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
c84427bd22
Fix: delete of files with [ and glob.
...
Conflicts:
test/phpunit/FilesLibTest.php
2013-04-30 22:52:56 +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
fhenry
440912a4d3
fix [ bug #827 ] AJAX search does not respect multiprice level
2013-04-30 21:35:27 +02:00
Laurent Destailleur
8f214a77c5
Fix: Fix error with linux rules
2013-04-30 21:31:35 +02:00
fhenry
ac6e56f058
Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur
2013-04-30 21:10:26 +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
fhenry
0b8d78c4f6
[ bug #865 ] Dolibarr navigation array in project/task do not work
...
Conflicts:
htdocs/projet/fiche.php
Change-Id: I7607f97d21cc695c9b295d94f5abcb64fe25f3af
2013-04-30 18:23:44 +02:00
Laurent Destailleur
761b2d05d4
Fix: delete of files with [ and glob.
2013-04-30 17:24:11 +02:00
fhenry
59f218ab42
[ bug #865 ] Dolibarr navigation array in project/task do not work
2013-04-30 16:00:30 +02:00
Grand Philippe
114ace6499
fix: undefined property
2013-04-30 15:22:39 +02:00
fhenry
1fc04d5b5c
Add table extrafield for commande fournisseur...
...
Seems this module work as separate from order but config is missing. Try
to create a new one.
2013-04-30 13:56:03 +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
Laurent Destailleur
4a9ed428f0
Fix: isset on scalar value
2013-04-30 09:58:30 +02:00
Marcos García
818c6e648a
Removed duplicated code
2013-04-29 22:04:46 +02:00
Laurent Destailleur
f8b4551ef6
Merge pull request #901 from marcosgdf/develop
...
Holidays module improvements
2013-04-29 10:28:47 -07:00
Laurent Destailleur
1e9157603d
Merge pull request #900 from defrance69/patch-3
...
Update project.class.php
2013-04-29 10:27:55 -07:00
Laurent Destailleur
9fabf75f14
Merge pull request #898 from defrance69/patch-1
...
Update projects.lang
2013-04-29 10:27:36 -07:00
Laurent Destailleur
4274a1aa21
Merge pull request #897 from grandoc/3.3
...
fix some indefined index
2013-04-29 10:27:25 -07:00
Laurent Destailleur
a9b7e9eaac
Merge pull request #899 from defrance69/patch-2
...
Update element.php
2013-04-29 10:27:16 -07:00
Laurent Destailleur
cd6ceaf3f4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-04-29 19:04:15 +02:00
Marcos García
bf36376215
Corrected ca_ES translations
...
Translations made by Juanjo Menent (simnandez)
2013-04-29 18:05:11 +02:00
Marcos García
da9cbc6e58
Corrected translation key
2013-04-29 18:02:18 +02:00
Marcos García
7dd457d2df
Added DurationDays string to the table
2013-04-29 18:01:26 +02:00
Marcos García
8837caeb6f
Style improvement
2013-04-29 17:57:24 +02:00
Marcos García
b9429fc98e
Fixed a bug when showing users to define holidays
2013-04-29 17:24:02 +02:00
simnandez
fd85755461
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:55:14 +02:00
simnandez
00adb1b9ab
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:46:07 +02:00
BENKE Charles
d9363f441a
Update project.class.php
...
Add feature to add element in elements page of a project
2013-04-29 13:02:58 +03:00
BENKE Charles
830aff99e4
Update element.php
...
add feature: join element from element page
2013-04-29 12:54:29 +03:00
BENKE Charles
1d68a01298
Update projects.lang
...
Add Link element on elements page
2013-04-29 12:49:03 +03:00
Laurent Destailleur
840dcfec38
Fix: Bad detection of PDF format.
2013-04-29 09:25:42 +02:00
Laurent Destailleur
9bbe5014e6
Fix: Bad field size on old installations
2013-04-28 23:50:40 +02:00
Laurent Destailleur
f6c2bd4928
Fix: Uniformize menu conditions
2013-04-28 23:25:28 +02:00
Grand Philippe
63c474e2cc
fix: Undefined index
2013-04-28 22:29:50 +02:00
Laurent Destailleur
ce47a7d731
printSearchForm hook match specifications
2013-04-28 20:53:23 +02:00
Laurent Destailleur
b21a13b789
Fix: compatibility with jmobile
2013-04-28 20:29:21 +02:00
Grand Philippe
c4a064d104
fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired
2013-04-28 19:35:10 +02:00
Laurent Destailleur
670d01e14e
Fix: Remove space char at end of document and viewimage.
2013-04-28 18:46:34 +02:00
Laurent Destailleur
27ae971f35
Fix: W3C
2013-04-28 12:46:52 +02:00
Grand Philippe
1d52d50ac1
fix: issue from last commit
2013-04-28 12:17:04 +02:00
Grand Philippe
0661f9f1f8
fix: Assigning the return value of new by reference is deprecated
2013-04-28 10:40:25 +02:00
Grand Philippe
647956576d
fix some indefined index
2013-04-28 08:21:46 +02:00
Marcos García
54fc731df7
Fix: [bug #856 ] Mail error if destination user doesn't have an email
2013-04-28 01:58:57 +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
Laurent Destailleur
7b85baa5e4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e
Uniformize code, order of fiels in card and language files.
2013-04-28 01:12:40 +02:00
Laurent Destailleur
757473cf86
Replace table with div
2013-04-28 00:36:49 +02:00
jfefe
54f0d1b1a5
Fix : use standard method to show extrafields
2013-04-27 22:57:29 +02:00
Laurent Destailleur
de1f53db45
Merge pull request #894 from marcosgdf/holidays-translations
...
Holidays translations
2013-04-27 12:54:16 -07:00
Laurent Destailleur
f8e0f40ffa
Merge pull request #891 from marcosgdf/bug-857
...
Fix: [ bug #857 ] Invoice created from shipment does not have the order ...
2013-04-27 12:53:55 -07:00
Laurent Destailleur
4c9a728799
Merge pull request #890 from marcosgdf/translations
...
Improved translations
2013-04-27 12:53:15 -07:00
Laurent Destailleur
ab668f0f07
Merge pull request #892 from marcosgdf/expedition-translations
...
Corrected incorrect lang trans key
2013-04-27 12:51:52 -07:00
Laurent Destailleur
07baa244ed
No need to make a test on a var
2013-04-27 21:38:49 +02:00
Laurent Destailleur
38bc86dc2a
Missing menu entry for home page
2013-04-27 21:37:30 +02:00
Laurent Destailleur
9dc0a19ed3
More logs
2013-04-27 21:36:52 +02:00
Laurent Destailleur
e4ea3b9b0e
Propagation of param missing.
2013-04-27 21:35:30 +02:00
simnandez
823b716042
Trad: Add ca_ES holiday translations
2013-04-27 17:52:14 +02:00
simnandez
d982148b7b
Fix: [ bug #855 ] Holiday approval email in French
2013-04-27 17:20:02 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
Marcos García
0672d10a3f
Fixed typos
2013-04-27 14:54:03 +02:00
Marcos García
bd2b363e40
Modified traslation keys to reflect expected translation
2013-04-27 14:50:14 +02:00
Marcos García
8e7b72d09e
Fixed incorrect translations in holidays module
2013-04-27 14:42:37 +02:00
Marcos García
7a115a9216
Expedition class name was not being translated when creating invoice from it
2013-04-27 13:55:20 +02:00
Marcos García
ecaea4c575
Corrected incorrect lang trans key
2013-04-27 13:51:05 +02:00
Marcos García
1065645fb6
Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
2013-04-27 13:45:25 +02:00
Marcos García
be5fcfdce3
Improved es_ES translations + replaced lang key in margins module admin page
2013-04-27 12:56:57 +02:00
Marcos García
36574771a6
Translation of barcode internal engine string
2013-04-27 12:49:19 +02:00
Marcos García
5784cb120a
Moved GenbarcodeLocation from products.lang to admin.lang
2013-04-27 12:32:20 +02:00
Laurent Destailleur
24309a7f17
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-04-27 12:25:22 +02:00
Laurent Destailleur
3203283fe9
Fix: remove warning
2013-04-27 12:24:48 +02:00
Laurent Destailleur
50dd0ef7ee
Merge pull request #885 from FHenry/develop
...
Review extrafield for compliance with wiki
2013-04-26 13:08:37 -07:00
Laurent Destailleur
b721111409
Merge pull request #883 from marcosgdf/bug-846
...
Fixed bug #846 : Create a supplier invoice (without project)
2013-04-26 13:05:52 -07:00
Laurent Destailleur
b1cf0b9a76
Merge pull request #889 from marcosgdf/translations
...
Corrected translation key
2013-04-26 13:04:27 -07:00
Laurent Destailleur
44a1120c06
Merge pull request #888 from FHenry/3.3
...
Fix bug Pgsql
2013-04-26 13:04:17 -07: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
f04abccdf3
Look cleaner
2013-04-26 21:07:51 +02:00
fhenry
91885a8bd4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-26 20:54:53 +02: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
fhenry
5dce16863f
Review delete extrafield in delete class method
2013-04-26 17:20:21 +02:00
Marcos García
652e0c1b5f
Corrected translation key
2013-04-26 17:19:14 +02:00
fhenry
53ca1546d0
Fetch optionnal into fetch of propal
2013-04-26 16:58:04 +02:00
fhenry
e76f997ded
Fix adherent class mistake
2013-04-26 16:53:22 +02:00
fhenry
5d8e541292
Fetch_optionals into fetch commande
2013-04-26 16:51:01 +02:00
Regis Houssin
d25687276e
Fix: bypass the second test if the first is ok
2013-04-26 16:29:29 +02:00
Regis Houssin
c0a3271d76
Fix: bypass the second test if the first is ok
2013-04-26 16:28:54 +02:00
Regis Houssin
c969d17e48
Fix: avoid error
2013-04-26 16:22:14 +02:00
Regis Houssin
3684271627
Fix: avoid error
2013-04-26 16:21:48 +02:00
Regis Houssin
36e6269b24
Fix: big security problem with multicompany
2013-04-26 16:08:02 +02:00
Regis Houssin
34036c2a5c
Fix: big security problem with multicompany
2013-04-26 16:07:35 +02:00
fhenry
c988944f1a
PDF admin : Add option to hide num TVA intra into adress of customer
2013-04-26 13:25:51 +02:00
fhenry
b67faf1eb1
Fix PgSQL
2013-04-26 13:01:42 +02:00
fhenry
4ff5922a55
Fix pgSQL bug
2013-04-26 12:53:13 +02:00
fhenry
9e1487fc61
Fix bug Pgsql
2013-04-26 12:44:21 +02:00
Regis Houssin
3b934118c5
Fix: security problem with multicompany
2013-04-26 12:36:02 +02:00
Regis Houssin
016b4a2baa
Fix: security problem with multicompany
2013-04-26 12:35:31 +02:00
fhenry
b9f7d4c302
Fix bug on invoice extrafield type date
2013-04-26 12:20:15 +02:00
fhenry
30ad2f1609
Fix bug in fetch_optionals
2013-04-26 10:51:17 +02:00
fhenry
b4f3e9d5a8
fix table name in migration script
2013-04-26 10:34:11 +02:00
fhenry
a06581771c
Reveiw extrafield for womplaiance with wiki
...
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +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
fhenry
d0f44bf25f
Add zero entity into extrafeild deletion
2013-04-26 08:46:25 +02:00
Marcos García
6ac6f6e911
Fixed bug #846 : Create a supplier invoice (without project)
2013-04-26 06:34:41 +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
ed5a00a79d
Merge pull request #880 from FHenry/3.3
...
fix [ bug #850 ] Dolibarr PGSQL
2013-04-25 13:40:14 -07:00
Laurent Destailleur
4c1f301f4e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-25 20:39:47 +02:00
Laurent Destailleur
3ecb61f18e
Fix: Using div
2013-04-25 20:36:38 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
Regis Houssin
4f600b6465
Fix: use $conf->entity if defined
2013-04-25 15:53:20 +02:00
Regis Houssin
d162a61d41
Fix: use $conf->entity if defined
2013-04-25 15:52:33 +02:00
Regis Houssin
ce3b8e5cc8
Fix: broken features with multicompany
2013-04-25 15:49:27 +02:00
Regis Houssin
2f72bbca5a
Fix: broken features with multicompany
2013-04-25 15:47:41 +02:00
Laurent Destailleur
edc84f4168
Fix: Label must be same into combo list than into admin page.
2013-04-25 13:12:57 +02:00
Laurent Destailleur
0a5415ee2a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-25 13:09:28 +02:00
Laurent Destailleur
542a9608a7
Missing translation
2013-04-25 13:04:06 +02:00
simnandez
9dde709c3e
Fix: typo errors
2013-04-25 13:01:38 +02:00
fhenry
bc7015a431
fix [ bug #850 ] Dolibarr PGSQL
2013-04-25 12:55:40 +02:00
Laurent Destailleur
726c83d2d2
Merge pull request #877 from FHenry/develop
...
Fix bug on Extrafield list table type
2013-04-25 01:23:57 -07:00
Laurent Destailleur
023b6f2e8b
Fix: Use entity
2013-04-25 10:22:08 +02:00
Laurent Destailleur
86ea79c860
Fix: dol_check_secure_access_document is also used by viewimage. This
...
also solve bug of not found supplier doc and solve some security holes.
2013-04-25 10:06:54 +02:00
Laurent Destailleur
cce857d6ee
Fix: When box is removed, it is added into combo box of available boxes.
2013-04-25 01:35:33 +02:00
Laurent Destailleur
3c5520f418
Fix: missing translation
2013-04-25 01:17:45 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
fhenry
8c440b3f57
Remove entity check in list table extrafield
2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b
Add Zero entity to shared extrafield
2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705
remove ver_export
2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6
Fix multicompany problem with extrafield list from table
2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482
Fix for php 5
2013-04-24 23:54:02 +02:00
fhenry
faced82abe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 23:49:49 +02:00
fhenry
4badcf5a75
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-04-24 23:19:22 +02:00
fhenry
cd7f94d515
[ bug #849 ] BUG PGSQL
2013-04-24 23:19:01 +02:00
fhenry
928a1afe18
Fix bug on Extrafield list table type
2013-04-24 21:32:22 +02:00
Laurent Destailleur
4a0c6c425e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-24 19:15:54 +02:00
Laurent Destailleur
00e39a219e
Merge pull request #876 from jfefe/test_ui
...
Minor interface improvements (theme eldy) : link uderline on hover / bold in array titles
2013-04-24 10:15:38 -07:00
Laurent Destailleur
3896b99bad
Add UK with GB.
2013-04-24 19:14:59 +02:00
fhenry
7b1616d0c5
Better management extrafield from list of table
2013-04-24 19:14:03 +02:00
Laurent Destailleur
0301d04fc4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-24 19:01:09 +02:00
Laurent Destailleur
20b9331b3c
Fix: W3C
2013-04-24 18:58:01 +02:00
Laurent Destailleur
b2129a519d
Merge pull request #875 from grandoc/3.3
...
fix undefined offset
2013-04-24 09:03:04 -07:00
Laurent Destailleur
ac4c236dbc
Merge pull request #874 from grandoc/develop
...
Develop
2013-04-24 09:02:51 -07:00
fhenry
5789a5d6e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 17:53:59 +02:00
fhenry
d9551abb70
Fix trad for Extrafield from table
2013-04-24 17:32:08 +02:00
simnandez
436b6259c0
Fix: finish merge
2013-04-24 16:57:46 +02:00
fhenry
9ce7e44f00
use price method rather than price2num. price are use in all PDF, so it
...
should be the same on ODT
2013-04-24 16:47:15 +02:00
Laurent Destailleur
d3d2ffe43e
Qual: A better error management for suse rpm package
2013-04-24 16:16:41 +02:00
Laurent Destailleur
9a2b72f8f8
Compatibility with jmobile
2013-04-24 15:49:43 +02:00
Grand Philippe
026195689b
fix undefined offset
2013-04-24 15:22:37 +02:00
Grand Philippe
1200155441
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-04-24 15:19:13 +02:00
Grand Philippe
d2a718d0e6
fix undefined offset
2013-04-24 15:18:42 +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
95f6b576b2
Look: Minor fix
2013-04-24 14:20:23 +02:00
Laurent Destailleur
fb1c306b31
Update nl
2013-04-24 13:59:08 +02:00
jfefe
c17775b9a1
Minor interface improvements (theme eldy) : link uderline on hover / bold in array titles
2013-04-24 13:39:39 +02:00
Laurent Destailleur
bca399623f
Fix: finish merge
2013-04-24 12:44:36 +02:00
Laurent Destailleur
f7aa90b3b3
Add user help
2013-04-24 12:43:23 +02:00
Laurent Destailleur
cbf44bf175
Change to be compatible with jmobile
2013-04-24 12:10:04 +02:00
fhenry
d9a2805100
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 08:50:51 +02:00
Laurent Destailleur
a8ea2a9d06
Prepare code for small screens
2013-04-24 04:06:13 +02:00
Laurent Destailleur
d5f3f47782
New: Use div for tabs.
2013-04-24 03:56:13 +02:00
Laurent Destailleur
b3e2050186
Fix: Remove warning
2013-04-23 23:44:49 +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
fhenry
23a7aae084
[ bug #841 ] Erreur compta/index
2013-04-23 14:48:34 +02:00
fhenry
52a1e81147
[ bug #842 ] Erreur SQL Propal
2013-04-23 14:43:32 +02:00
Laurent Destailleur
203d4e3ca8
Prepare database for parameters into boxes
2013-04-23 14:17:04 +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
fhenry
ba0e9c0c19
Fix [ bug #843 ] Erreur SQL box_stock
...
fix [ bug #842 ] Erreur SQL Propal
2013-04-23 14:02:29 +02:00
Laurent Destailleur
dbc2eddcba
Prepare for 3.3.2
2013-04-23 12:09:21 +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
39d3d1a34e
Enhance script to send email to sale representatives
2013-04-23 12:00:31 +02:00
Laurent Destailleur
78a0c7ace2
Fix: log must use the mask defined into setup
2013-04-23 12:00:02 +02:00
fhenry
0513cbe655
Add debug log (dol_syslog)
2013-04-23 11:12:07 +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
Laurent Destailleur
6f5ce77846
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 20:42:25 +02:00
Laurent Destailleur
4e939f558a
Restore font weight
2013-04-22 20:41:38 +02:00
Laurent Destailleur
dabd68aba6
Merge pull request #866 from atm-maxime/develop
...
Fix : column missing in migration for price by qty
2013-04-22 11:40:17 -07:00
Laurent Destailleur
83e873dd24
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-04-22 20:37:28 +02:00
Laurent Destailleur
9135fd0272
Merge pull request #868 from jfefe/webservices
...
New webservice to retrieve a document (work on invoice, propal, order and generic
2013-04-22 11:35:35 -07:00
Laurent Destailleur
2c4515f40e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8
Removed version into trigger page (version on trigger is useless since
...
trigger depend on module. Only version of module is required).
2013-04-22 19:59:41 +02:00
Regis Houssin
81333c700b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 16:45:15 +02:00
Regis Houssin
7f6a87ab35
FIXME regresion if code with not in numeric base
2013-04-22 16:44:25 +02:00
Regis Houssin
f8ddd69ccb
FIXME regresion if code with not in numeric base
2013-04-22 16:42:44 +02:00
Maxime Kohlhaas
a747ef6939
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-04-22 16:38:13 +02:00
simnandez
de5a57a3c8
Fix: Uniformize creation in orders
2013-04-22 16:23:59 +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
7217d91f13
Fix: missing commit
2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88
Fix: missing commit
2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a
Fix: broken features
2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504
Fix: broken features
2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492
Mutualize code for security check when accessing a document by document.php and bywebservice
2013-04-22 15:00:29 +02:00
Regis Houssin
733872e9c9
Fix: merge problem
2013-04-22 14:48:08 +02:00
Regis Houssin
5ccb4108d4
Fix: merge problem
2013-04-22 14:47:37 +02:00
Regis Houssin
1be6a2c120
Fix: broken features for fileupload
2013-04-22 14:39:25 +02:00
Regis Houssin
7883e4f0eb
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-04-22 14:38:38 +02:00
Regis Houssin
63a5aee80e
Fix: broken features for fileupload
2013-04-22 14:37:18 +02:00
jfefe
28cbe7d0b3
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices
2013-04-22 14:34:11 +02:00
Laurent Destailleur
e65e6516c5
Fix: Logon theme on amarok
2013-04-22 14:33:47 +02:00
Laurent Destailleur
88fe3e86f2
Missing translation
2013-04-22 14:01:47 +02:00
Laurent Destailleur
b9dab6d059
Fix: Korting
2013-04-22 13:57:24 +02:00
jfefe
60382f4b2c
New webservice to retrieve a document (work on invoice, propal, order and generic)
2013-04-22 13:18:40 +02:00
Laurent Destailleur
ed4c18b9d3
Update changelog.
...
Fix: Fix template ODS.
2013-04-22 13:15:33 +02:00
Laurent Destailleur
6adaf2fa8f
Fix: Pb when using virtual products inside virtual products
2013-04-22 13:02:10 +02:00
Laurent Destailleur
335c8cd511
Look: Minor change
2013-04-22 13:01:38 +02:00
Laurent Destailleur
c87c7703cd
Qual: Make code simpler.
2013-04-22 13:01:22 +02:00
Laurent Destailleur
54040bed1d
Fix: No slash alone
2013-04-22 12:48:56 +02:00
Laurent Destailleur
5b4b058399
Perf: Minor perf enhancement
2013-04-22 12:30:52 +02:00
fhenry
e6f9c567d9
Fix odt as PDF generation
2013-04-22 12:08:35 +02:00
Maxime Kohlhaas
882da5d7d7
Fix : price by quantity, bad column name
2013-04-22 11:54:30 +02:00
Laurent Destailleur
5cbb0359aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd
Fix: Some translation change to have things more clear.
2013-04-22 10:33:06 +02:00
Regis Houssin
ab4a3dcaa7
Fix: missing rename field
2013-04-22 10:18:03 +02:00
Maxime Kohlhaas
7c01e984f8
Fix : column missing in migration for price by qty
2013-04-22 10:05:32 +02:00
Laurent Destailleur
7ff2e559aa
Fix: PGsql compatibility
2013-04-22 01:59:52 +02:00
Laurent Destailleur
89ad634230
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Laurent Destailleur
9b07271460
Merge pull request #864 from jfefe/doc_ods
...
Task [#838 ] : Can generate ods document on thirdparty
2013-04-21 16:32:07 -07:00
Laurent Destailleur
577346f44d
Merge pull request #863 from defrance69/patch-28
...
Update products.lang
2013-04-21 16:27:10 -07:00
Laurent Destailleur
64c94b1a4d
Merge pull request #862 from defrance69/patch-27
...
Update products.lang
2013-04-21 16:26:55 -07:00
Laurent Destailleur
87ce23c4b8
Merge pull request #858 from marcosgdf/fix-notifications-alert-bug
...
Notifications popup messages were not showing real notifications that we...
2013-04-21 16:08:33 -07:00
Laurent Destailleur
11023fa210
Merge pull request #857 from marcosgdf/task-823
...
New: [ task #823 ] Shipping_validate email notification
2013-04-21 16:07:37 -07:00
Laurent Destailleur
e19e0ff557
Fix: Error management
2013-04-22 00:57:56 +02:00
Laurent Destailleur
3f09cbec7e
Merge pull request #855 from marcosgdf/minor-refactor
...
ECM Refactor
2013-04-21 15:18:15 -07:00
Laurent Destailleur
49552b999c
Merge pull request #854 from marcosgdf/develop
...
Refactor + replaced "OK" and "Error" status install messages with images
2013-04-21 15:15:34 -07:00
Laurent Destailleur
9f3164d710
Merge pull request #849 from GPCsolutions/ca_report_improvments
...
Improved reports
2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317
Merge pull request #865 from FHenry/develop
...
Add extrafield select from table
2013-04-21 15:12:04 -07:00
Laurent Destailleur
1f0adfaff5
Can remove an element from category when on category view.
2013-04-21 23:44:33 +02:00
Laurent Destailleur
5893fadb58
Look: Minor style enhancement
2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6
Add extrafield select from table
2013-04-21 17:36:23 +02:00
JF FERRY
8cb7770a6a
Add ODS document for example
2013-04-21 17:06:25 +02:00
JF FERRY
642ba10d84
New hidden option to introduce timing value into odt document nam
2013-04-21 17:04:54 +02:00
Laurent Destailleur
f4513d1beb
Move option ate better place
2013-04-21 16:01:36 +02:00
BENKE Charles
72e571fcd5
Update products.lang
...
Add Fabrication Feature
2013-04-21 16:16:13 +03:00
BENKE Charles
0a853c9c7c
Update products.lang
2013-04-21 16:14:40 +03: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
Marcos García
5b248805c2
Notifications popup messages were not showing real notifications that were going to be sent
2013-04-21 14:24:19 +02:00
Marcos García
82e3a8d0b9
New: [ task #823 ] Shipping_validate email notification
2013-04-21 14:14:30 +02:00
Marcos García
293fc89a9f
Missing copyright
2013-04-21 12:45:34 +02:00
Marcos García
17902a8455
Removed var_dump
2013-04-21 12:44:13 +02:00
Marcos García
7befeae371
ECM Refactor
2013-04-21 12:42:58 +02:00
Laurent Destailleur
ab2709f684
Filter on agenda event are autoselected on "manual event".
2013-04-21 12:26:44 +02:00
Laurent Destailleur
01ec3d79ca
Reduce default size of description
2013-04-21 11:59:15 +02:00
Marcos García
52b4daf696
Refactor + replaced "OK" and "Error" status install messages with images
2013-04-21 10:43:34 +02:00
Raphaël Doursenaud
6cce2c0b10
Added forgotten file
2013-04-21 10:19:07 +02:00
Raphaël Doursenaud
50eb88db5d
Fixed turnover by user
...
Mistakingly used distinct in SQL request
2013-04-21 10:11:19 +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
Laurent Destailleur
12caa20e38
Merge pull request #850 from atm-maxime/develop
...
Carrier conf modification
2013-04-20 11:42:44 -07:00
Laurent Destailleur
a4c23b1dcd
Merge pull request #852 from marcosgdf/develop
...
Refactor + es_ES translations improvement + minor stetic change
2013-04-20 11:42:16 -07:00
Laurent Destailleur
4d54b8a22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-20 20:30:48 +02:00
Laurent Destailleur
dd13c334c7
New: Compatibility with jmobile
2013-04-20 20:30:18 +02:00
fhenry
4202c8fc91
required once instead of require
2013-04-20 17:56:39 +02:00
Laurent Destailleur
2008fd1419
Fix: Optimize for small screen
2013-04-20 17:49:24 +02:00
fhenry
cae761d522
[ task #640 ] Better deposit invoice management
2013-04-20 17:10:03 +02:00
Maxime Kohlhaas
ef13ea8690
New # 786 : can link project from supplier invoice creation
2013-04-20 14:33:00 +02:00
fhenry
61b78666a2
Change-Id: I07221687a67be28376ee9146eaa46567486300ce
2013-04-20 13:29:40 +02:00
Maxime Kohlhaas
129da11a52
Fix : consumption
2013-04-20 13:13:33 +02:00
Maxime Kohlhaas
571037d396
Fix : consumption on company
2013-04-20 13:09:26 +02:00
fhenry
dd8a84bce3
Fix [ bug #833 ] Accounting journals are broken
2013-04-20 13:08:06 +02:00
Maxime Kohlhaas
cf945f0187
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-04-20 13:00:33 +02:00
Marcos García
1e00ccd07d
Purchases and sellsjournal used tabs in their copyright comment. Restored 'em
2013-04-20 12:59:34 +02:00
Marcos García
c3c57351d0
Updated copyright
2013-04-20 12:57:50 +02:00
Marcos García
651b1ae7ce
Refactor + es_ES translations improvement + minor stetic change
2013-04-20 12:55:31 +02:00
Maxime Kohlhaas
a9974f66b2
Fix : url was given even if value of tracking was empty + remove old use of "methode_expedition..." files
2013-04-20 11:03:36 +02:00
fhenry
ffb97010c9
Better file name management
2013-04-20 11:03:23 +02:00
fhenry
96126d9c99
Save PDF file
2013-04-20 10:54:11 +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
Juanjo Menent
62c104e3b6
Merge pull request #847 from GPCsolutions/installpass
...
Hide database password behind a password field
2013-04-20 00:49:37 -07:00
Juanjo Menent
2d9da0c4cf
Merge pull request #848 from GPCsolutions/note
...
Note update fixes batch
2013-04-20 00:43:05 -07:00
Raphaël Doursenaud
f2bd1461b2
Improved reports
...
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
2013-04-20 07:33:10 +02:00
fhenry
62c9366d69
fix debug
2013-04-20 07:21:26 +02:00
fhenry
75194ddb57
Ifo user visibility and maxlength product label regarding db column size
2013-04-20 07:05:31 +02:00
Raphaël Doursenaud
13c48d4970
Fixed more private note updates
2013-04-20 06:43:14 +02:00
Raphaël Doursenaud
a564edbb87
Fixed private note update
2013-04-20 06:43:14 +02:00
Raphaël Doursenaud
62f0f6011f
Fixed note typo
2013-04-20 06:43:13 +02:00
Raphaël Doursenaud
052d75321f
Fixed user note with new update note API
2013-04-20 06:43:13 +02:00
Raphaël Doursenaud
e1a3d46ea0
Fixed for new API for note update
2013-04-20 06:43:13 +02:00
Raphaël Doursenaud
bf84436482
Fixed typo and used new API for note update
2013-04-20 06:43:13 +02:00
Raphaël Doursenaud
e3610dfa49
Forgotten update_note parameter
...
Fixes project cloning
2013-04-20 05:53:18 +02:00
Raphaël Doursenaud
96043bd3d3
Hide database password behind a password field
2013-04-20 05:37:52 +02:00
fhenry
7b080dec65
Better extrafield management
2013-04-20 05:11:25 +02:00
fhenry
880659af3a
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-04-20 02:49:16 +02:00
Laurent Destailleur
fa69f693db
Merge pull request #845 from marcosgdf/translations
...
Translations + minor bug fix
2013-04-19 17:22:32 -07:00
Laurent Destailleur
162ccf68b6
Merge pull request #841 from FHenry/develop
...
fix [ bug #825 ] User first name not visible into users->perms
2013-04-19 17:21:16 -07:00
Laurent Destailleur
6a9ebcac7b
Merge pull request #844 from grandoc/3.3
...
fix : undefined variable
2013-04-19 17:10:41 -07:00
Marcos García
95ca8db9eb
Improved es_ES translations
2013-04-20 00:34:03 +02:00
Marcos García
d90a0acbec
Missing externalsite module translations
2013-04-20 00:18:57 +02:00
fhenry
e2d0d0d414
Fix fix as Eldy wish it
2013-04-20 00:10:20 +02:00
Marcos García
40a9ab9772
Added missing translations
2013-04-20 00:08:09 +02:00
Marcos García
458b1cdf60
Improved dictionary translations + minor bug fix
2013-04-19 23:33:54 +02:00
Maxime Kohlhaas
bfb05c78cd
Change carrier config into dict instead of dedicated conf page
2013-04-19 20:20:10 +02:00
Maxime Kohlhaas
26aba2b609
Add tracking url for carriers in dict
2013-04-19 19:46:49 +02:00
unknown
8030b39536
fix : undefined variable
2013-04-19 19:45:06 +02:00
Laurent Destailleur
eebbcbec57
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-19 19:18:39 +02:00
Marcos García
becd40a825
Fixed bug #828 : Error when code_region is not a number in llx_c_regions (with postgres)
2013-04-19 15:38:24 +02:00
Laurent Destailleur
bb3f40a1bf
Qual: Clean code to be able to update combo box when removing a box.
...
Qual: Opensurvey tables
2013-04-19 15:26:53 +02:00
fhenry
a3c5bef381
Fix bug FactureLine update for PgSQL
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/41317-impossible-de-modifier-une-ligne-de-facture#41422
2013-04-19 15:12:02 +02:00
Laurent Destailleur
08ae1d289b
Pgsql compatibility
2013-04-19 15:02:53 +02:00
Laurent Destailleur
570e4391a5
Fix: Box with product out of stocks for pgsql
2013-04-19 14:51:39 +02:00
Regis Houssin
556574cbc9
FIXME: this field not exist in llx_product_fournisseur_price
2013-04-19 13:47:30 +02:00
Regis Houssin
5d7b94f661
Fix: the purchase price, manually entered is not taken recovered
2013-04-19 13:30:08 +02:00
Regis Houssin
077698d789
Fix: for avoid missing the customer discount
2013-04-19 12:47:53 +02:00
Laurent Destailleur
56a0f70ad3
Fix: margin disabled into demo for foundation
2013-04-19 10:33:25 +02:00
Laurent Destailleur
ea4b78b326
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-19 10:09:02 +02:00
Laurent Destailleur
8a69cdd433
Fix: delete of survey
2013-04-19 10:08:30 +02:00
Regis Houssin
50ec96d368
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-04-19 09:58:00 +02:00
Regis Houssin
17d5ab9774
Fix: no result with a number with a comma
...
Conflicts:
htdocs/fourn/facture/index.php
Change-Id: I6c67e3d2936673ea0993adfa1597bd11caf125fe
2013-04-19 09:57:13 +02:00
Regis Houssin
45300ccdd8
Fix: no result with a number with a comma
2013-04-19 09:55:22 +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
Regis Houssin
3e9a8677c6
Fix: no result with a number with a comma
2013-04-19 09:48:55 +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
Laurent Destailleur
8eedf3db96
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-19 09:11:09 +02:00
Laurent Destailleur
d5a4f73501
Add fill/reset
2013-04-19 09:10:56 +02:00
fhenry
738ed467b3
Fix bug on update invoice line in PgSQL
2013-04-19 07:54:55 +02:00
Laurent Destailleur
6860aa05c7
Fix: Missing test
2013-04-19 00:20:21 +02:00
Laurent Destailleur
ac8868e2d2
Fix: Use correct format for js
2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e
Qual: Work to prepare usage of jquery data plugins.
2013-04-18 19:37:50 +02:00
fhenry
ce60e503bc
Fix trans for [ task #826 ] Increasing stock when deleting an invoice
2013-04-18 18:10:56 +02:00
Regis Houssin
301ae58cdd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-18 11:16:09 +02:00
Regis Houssin
ebb09db710
Fix: for avoid errors
2013-04-18 11:05:31 +02:00
Juanjo Menent
e58e326c9c
Merge pull request #842 from atm-maxime/develop
...
2 minor fixes
2013-04-18 01:20:40 -07:00
Maxime Kohlhaas
6c62d0cd28
Print forgotten
2013-04-18 10:12:16 +02:00
Regis Houssin
b6bcffa4d9
Fix: missing field
2013-04-18 09:44:33 +02:00
Regis Houssin
2538a9e20e
Fix: duplicate sql request
2013-04-18 09:39:43 +02:00
Maxime Kohlhaas
dcdbdd42fb
Fix : action list couldn't be sorted by label, action type was kept in filter
2013-04-18 09:25:19 +02:00
Maxime Kohlhaas
1381373c95
Fix : set emetteur to MYCOMPANY when payment is a customer
2013-04-18 09:24:29 +02:00
fhenry
c0c1de7992
[ task #826 ] Increasing stock when deleting an invoice
2013-04-18 08:40:29 +02:00
Laurent Destailleur
31ce3d67a3
Merge remote-tracking branch 'origin/3.3' into develop
2013-04-17 23:18:15 +02:00
fhenry
07a4709b45
fix [ bug #825 ] User first name not visible into users->perms
2013-04-17 21:14:46 +02:00
Laurent Destailleur
52a0df3424
Fix: Bad translation
2013-04-17 20:13:42 +02:00
simnandez
c9074231b5
Fix: Spelling es_ES boxes lang
...
Trad: Add ca_ES missing translations
2013-04-17 17:06:19 +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
f9541590c7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-17 16:26:33 +02: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
21a1441a80
Merge pull request #839 from FHenry/3.3
...
Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
2013-04-17 02:58:32 -07:00
Laurent Destailleur
41ed4b57c4
Merge pull request #838 from FHenry/develop
...
Fix [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
2013-04-17 02:58:16 -07:00
Regis Houssin
5c50b1db57
Fix: use empty instead isset
2013-04-17 10:42:44 +02:00
Regis Houssin
4c13a4049c
Fix: use empty instead isset
2013-04-17 10:41:54 +02:00
fhenry
1b044fd9d6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-16 20:07:42 +02:00
Laurent Destailleur
d28316f4a8
Look: Optimize size
2013-04-16 16:33:05 +02:00
Laurent Destailleur
b30c492494
Fix: pgsql upgrade
2013-04-16 16:29:21 +02:00
fhenry
7e3ca0ce16
Fix bug
...
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug#22548
2013-04-16 16:02:13 +02:00
fhenry
e2156b5df7
Fix bug
...
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug
2013-04-16 16:00:23 +02:00
Laurent Destailleur
a5deb8e9d7
Fix: bug into is_erasable function.
...
Conflicts:
test/phpunit/NumberingModulesTest.php
2013-04-16 15:54:36 +02:00
Laurent Destailleur
4fe49b6736
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196
Fix: bug into is_erasable function.
2013-04-16 15:00:41 +02:00
fhenry
cba73b238c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal.php
Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
9659ecba70
Merge pull request #836 from jfefe/extrafields
...
Fix on extrafields date type : do not show current date when field not r...
2013-04-16 02:33:01 -07:00
fhenry
eb0d2cc5d8
Fix [ bug #789 ] VAT not being calculated in POS
2013-04-16 08:56:45 +02:00
Juanjo Menent
1602fcf7bc
Merge pull request #837 from FHenry/3.3
...
Fix [ bug #789 ] VAT not being calculated in POS
2013-04-15 23:54:03 -07:00
Laurent Destailleur
d3f29649d5
Fix into div/br
2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +02:00
Laurent Destailleur
4fab5fbeeb
Fix: bad language file
2013-04-15 23:11:48 +02:00
fhenry
7d6c89169c
Fix [ bug #789 ] VAT not being calculated in POS
2013-04-15 23:06:03 +02:00
Laurent Destailleur
3887b904ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-15 22:26:33 +02:00
Laurent Destailleur
51fe0d9e09
Removed duplicate function
2013-04-15 22:26:03 +02:00
Regis Houssin
7177e59ea4
Fix: missing quote
2013-04-15 21:41:34 +02:00
Regis Houssin
5682e0ae25
Fix: missing quote
2013-04-15 21:40:49 +02:00
Regis Houssin
c9dba00f3f
Fix: missing current entity record
2013-04-15 21:29:49 +02:00
Regis Houssin
21056d2b78
Fix: missing current entity record
2013-04-15 21:27:01 +02:00
jfefe
610fed6b3c
Fix on extrafields date type : do not show current date when field not required
2013-04-15 18:42:00 +02:00
Laurent Destailleur
b7edb3f472
Fix: Correct css
2013-04-15 18:04:22 +02:00
Laurent Destailleur
37e54b3d80
Qual: Update copyright files.
...
Qual: Removed not used library.
Look: Uniformize css.
2013-04-15 18:00:20 +02:00
simnandez
76132206bf
Fix: Bad link to all proposals into Third party card if customer is
...
prospect
2013-04-15 17:12:31 +02:00
Laurent Destailleur
8e1c06f617
Qual: Cleaner menu sources
2013-04-15 15:56:50 +02:00
fhenry
24a6321d45
Fix : Add service date limit transfert from propal to order
2013-04-15 15:55:10 +02:00
Laurent Destailleur
a4073dddd4
Doxygen llxHeader and llxFooter.
2013-04-15 15:43:25 +02:00
fhenry
acd3d136b5
[ task #798 ] Add range limit date on product/services as it is done on
...
order and invoice
2013-04-15 15:31:12 +02:00
fhenry
882560dad7
Fix [ bug #821 ] 'f.facnumber' in accountancy
2013-04-15 14:34:32 +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
Laurent Destailleur
8a0e111417
Fix: Bad array type
2013-04-15 12:39:34 +02:00
fhenry
8f8dce19cc
Task Project Extrafield : Forget to add to index tables
2013-04-15 12:38:27 +02:00
Laurent Destailleur
2db3bcc72e
Fix: migration 3.3.0 to 3.4.0
2013-04-15 10:00:09 +02:00
Marcos García
0ac7696bc0
Improved holidays module translations
...
Conflicts:
htdocs/holiday/fiche.php
htdocs/langs/fr_FR/holiday.lang
2013-04-15 09:29:26 +02:00
Marcos García
421dc07077
Improved es_ES holidays translations
2013-04-15 09:25:41 +02:00
Juanjo Menent
fb41ed68c4
Merge pull request #833 from marcosgdf/translations
...
Improved and added missing es_ES translations
2013-04-15 00:21:41 -07:00
simnandez
ae09d2fa3f
Improved margins ca_ES translation
2013-04-15 09:11:58 +02:00
Marcos García
9163a0a9d0
Converted indentation to tabs
2013-04-15 09:11:40 +02:00
Marcos García
60cd3d1e41
Fixed bug #807 : Margins modules with orders2invoice does not respect cost price
...
Also, removed duplicated requires in orderstoinvoice.php
2013-04-15 09:11:30 +02:00
Marcos García
150c862705
Improved margins es_ES translation
2013-04-15 09:11:20 +02:00
Marcos García
6d896a8558
Improved holidays module translations
2013-04-15 00:53:06 +02:00
Marcos García
deaa63960e
Improved es_ES holidays translations
2013-04-15 00:18:08 +02:00
Marcos García
16afa18e95
Improved and added missing es_ES translations
2013-04-15 00:09:29 +02:00
Laurent Destailleur
36c55971b5
Fix: PHPUnit Regression
2013-04-14 23:57:07 +02:00
Laurent Destailleur
67052933ca
Fix: PHPUnit
2013-04-14 23:42:24 +02:00
Laurent Destailleur
eead2977d9
Fix: pgsql upgrade
2013-04-14 23:15:55 +02:00
Laurent Destailleur
0e073038ad
Fix: Check on correct security key
2013-04-14 20:59:16 +02:00
Laurent Destailleur
f028cce39d
Qual: More log
2013-04-14 20:43:38 +02:00
Laurent Destailleur
de9f100968
Fix: check read feature
2013-04-14 20:34:31 +02:00
Laurent Destailleur
22731788c5
Qual: Remove duplicate script. Enhance old one.
2013-04-14 20:15:55 +02:00
Laurent Destailleur
67a4431529
Fix into emailing
2013-04-14 20:05:23 +02:00
Laurent Destailleur
a0851ba99f
More complete log.
2013-04-14 18:10:02 +02:00
Laurent Destailleur
e4c4cced70
Look: Optimize for small screen
2013-04-14 16:11:55 +02:00
Laurent Destailleur
a5d996de4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-14 14:45:43 +02:00
Laurent Destailleur
f8c3396fa7
Fix: "Now" button was not working when using combo calendar selector.
2013-04-14 14:45:23 +02:00
Laurent Destailleur
22402c38f8
Still working on new menu management.
2013-04-14 14:32:38 +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
simnandez
e27e5e9c44
Improved margins ca_ES translation
2013-04-14 13:53:48 +02:00
Juanjo Menent
e934614fce
Merge pull request #830 from marcosgdf/bug-807
...
Fixed bug #807 : Margins modules with orders2invoice does not respect cost price
2013-04-14 04:44:58 -07:00
Marcos García
b6ce386513
Converted indentation to tabs
2013-04-14 13:07:05 +02:00
Marcos García
90b9e7c136
Fixed bug #807 : Margins modules with orders2invoice does not respect cost price
...
Also, removed duplicated requires in orderstoinvoice.php
2013-04-14 13:06:13 +02:00
Marcos García
6b031616fa
Improved margins es_ES translation
2013-04-14 12:34:10 +02:00
Laurent Destailleur
baad1ffc56
New: Add link to autofill/reset with quantity to ship when creating
...
a delivery receipt.
2013-04-14 12:19:21 +02:00
Laurent Destailleur
3cec5bfc40
doxygen
2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34
doxygen
2013-04-14 10:50:33 +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
263e9098fa
Fix: group name not visible
2013-04-14 02:54:54 +02:00
Laurent Destailleur
51f444fb8c
Look: Optimize title lines
2013-04-14 02:09:41 +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
38cb9a530f
Doxygen
2013-04-14 01:28:43 +02:00
Laurent Destailleur
2f5709e3cb
Fix: Some fix into holiday module
2013-04-14 01:21:54 +02:00
Laurent Destailleur
bda39f25bf
New: Default aprrover for holidays i sby default hierchical parent.
2013-04-14 01:04:11 +02:00
Marcos García
486425d258
Merge branch '3.3' into bug-817
...
Conflicts:
ChangeLog
2013-04-13 23:58:05 +02:00
Laurent Destailleur
7e48e341ad
Merge pull request #829 from marcosgdf/translations
...
Added missing translation
2013-04-13 14:23:07 -07:00
Laurent Destailleur
fc22489104
Fix: Option SOCIETE_DISABLE_CUSTOMERS not complete
2013-04-13 21:18:41 +02:00
Laurent Destailleur
355168527d
Look: Optimize for smartphone
2013-04-13 18:41:43 +02:00
Laurent Destailleur
1a1e09a5ed
Qual: Clean and mutualize code.
2013-04-13 18:33:23 +02:00
Marcos García
7c4b901b0a
Improved es_ES translations and replaced missing translation
2013-04-13 17:45:41 +02:00
Marcos García
418921f360
Revert "Revert "Added missing translation""
...
This reverts commit 85866ff9a6
2013-04-13 17:14:06 +02:00
Marcos García
a6ed2551fb
Revert "Replaced Rest not translated string with AlreadyPaid"
...
This reverts commit 580881c205
2013-04-13 17:13:59 +02:00
Marcos García
580881c205
Replaced Rest not translated string with AlreadyPaid
2013-04-13 17:12:16 +02:00
Marcos García
85866ff9a6
Revert "Added missing translation"
...
This reverts commit 404ad18425
2013-04-13 17:10:07 +02:00
Laurent Destailleur
8a88b130b4
Fix: Bad label shown
2013-04-13 16:31:25 +02:00
Laurent Destailleur
20c9370690
New: Support the mode readonly of ckeditor
2013-04-13 16:23:05 +02:00
Marcos García
404ad18425
Added missing translation
2013-04-13 16:04:51 +02:00
Laurent Destailleur
e24fb9f48a
Removed all old code. All orignal code has been rewritten now.
2013-04-13 15:43:31 +02:00
Marcos García
b3a035951f
[ bug #817 ] Purchases journal does not reflect localtaxes
2013-04-13 15:22:59 +02:00
Laurent Destailleur
473fbf2c33
Fix: syntax error
2013-04-13 15:09:57 +02:00
Marcos García
d6b42ac879
[ bug #816 ] Sales journal does not reflect localtaxes
2013-04-13 14:44:56 +02:00
Laurent Destailleur
6e495bfbe1
Fix: lang loading
2013-04-13 14:38:26 +02:00
Laurent Destailleur
2b94188414
Fix: Languages files permissions and loading
2013-04-13 14:09:50 +02:00
Laurent Destailleur
3683f3cc82
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-13 13:56:26 +02:00
Laurent Destailleur
4bb815937a
Module opensurvey become a standard feature.
2013-04-13 13:56:13 +02:00
Marcos García
ac0cd975cd
Added missing table head strings into supplier invoices
2013-04-13 13:03:13 +02:00
Marcos García
b6f765ef3c
Improved es_ES translations
2013-04-12 23:51:52 +02:00
Laurent Destailleur
90cfa42915
Fix: removed useless
2013-04-12 19:45:09 +02:00
Laurent Destailleur
43fd068d1d
Qual: Uniformize way to get graph sizes.
2013-04-12 18:45:19 +02:00
Laurent Destailleur
62893c2ae4
Qual: uniformize code to use function de set with and height for graphs
2013-04-12 17:08:54 +02:00
Laurent Destailleur
26653a42e4
Optimize for terminal with no_mouse_hover
2013-04-12 16:53:06 +02:00
Laurent Destailleur
97b0076c5a
Doxygen
2013-04-12 16:31:16 +02:00
Laurent Destailleur
506da3cf21
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-12 16:21:40 +02:00
Laurent Destailleur
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
Regis Houssin
faebda20d5
Fix: wrong amounts
2013-04-12 16:09:52 +02:00
Laurent Destailleur
3b939206da
Look: Minor optimization
2013-04-12 14:55:40 +02:00
Laurent Destailleur
3238a22afd
Fix: Do not show not defined entries
2013-04-12 14:46:48 +02:00
Laurent Destailleur
8f7f0b142d
Fix: Change of permission are immediatly effective
2013-04-12 14:27:41 +02:00
Laurent Destailleur
c9b3193c44
Fix: Hooks with version 3.4 must match specification defined here:
...
http://wiki.dolibarr.org/index.php/Hooks_system
So i try a better fix that implement correctly this. To have the
moveFileUpload trigger keeping dolibarr code, it must return 0.
2013-04-12 13:18:24 +02:00
fhenry
cc497490eb
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-12 11:09:53 +02:00
simnandez
2e9a8369a7
Trad: Update ca_ES and es_ES translations
2013-04-12 10:46:33 +02:00
Regis Houssin
9596134e47
Fix: use new method
2013-04-12 10:28:19 +02:00
Regis Houssin
0b2b888584
Fix: use new method
2013-04-12 10:26:52 +02:00
Regis Houssin
85e09a953f
Fix: missing return with hook
2013-04-12 10:04:10 +02:00
Regis Houssin
3892a52852
Fix: missing return with hook
2013-04-12 10:00:20 +02:00
Laurent Destailleur
f5c0886cb1
Fix: another not complete change for adding ref for supplier invoices.
2013-04-12 00:22:53 +02:00
Laurent Destailleur
d6d8f91dda
Fix: Rename of field not complete
2013-04-12 00:19:18 +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
Marcos García
9ec74194a0
Translated linked object propal module name
2013-04-11 23:10:27 +02:00
Laurent Destailleur
fe20f8ae1b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
htdocs/install/mysql/tables/llx_expedition.key.sql
htdocs/install/mysql/tables/llx_expedition.sql
2013-04-11 23:08:10 +02:00
Laurent Destailleur
edcc201305
Fix: not complete renaming
2013-04-11 23:04:25 +02:00
Laurent Destailleur
891dbf5c60
Fix: Not complete renaming
2013-04-11 21:53:41 +02:00
Regis Houssin
c74fb3e3e9
Fix: remove constraint and index before rename field !!
2013-04-11 21:29:38 +02:00
Regis Houssin
3e019bab53
Fix: warning when you rename fields !!!!
2013-04-11 21:23:26 +02:00
Laurent Destailleur
4876aee493
Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON
2013-04-11 20:32:09 +02:00
Laurent Destailleur
9a812b799d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-11 20:02:50 +02:00
Laurent Destailleur
0d79f8e764
Look: Replace table with div
2013-04-11 20:00:12 +02:00
Laurent Destailleur
616219c99c
Merge pull request #822 from FHenry/develop
...
Qual : PHP Code_Sniffer
2013-04-11 10:14:03 -07: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
af40d27eb5
Remove require_once from odf.php because it cause regression.
2013-04-11 17:26:49 +02:00
Regis Houssin
030752c4c6
Fix: missing to rename constant
2013-04-11 17:24:17 +02:00
Regis Houssin
662d9cfa6e
Fix: for avoid problem with multicompany thirdparty sharing
2013-04-11 17:11:15 +02:00
Regis Houssin
9b2cbfef05
Fix: for avoid problem with multicompany thirdparty sharing
2013-04-11 17:10:11 +02:00
fhenry
6335918d72
Quel : indentation
2013-04-11 17:06:53 +02:00
fhenry
f837528ad3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-11 15:59:09 +02:00
fhenry
db86735fe6
Qual : php code sniffer
2013-04-11 10:52:02 +02:00
fhenry
b3b0c73f31
Qual : PHP Code Sniffer
2013-04-11 10:51:31 +02:00
Laurent Destailleur
b52ca834a0
Optimize size of area
2013-04-11 10:23:35 +02:00
Laurent Destailleur
aeae723108
New: Event into calendar use different colors for different users.
2013-04-11 10:15: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
9a29014716
New: Add color field into user table
2013-04-11 09:44:09 +02:00
Laurent Destailleur
750b30863f
Qual: Clean code from things that should be inside external module.
2013-04-11 09:15:41 +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
Laurent Destailleur
76c180aaaf
Fix: encoding at wrong place
2013-04-10 23:13:55 +02:00
Laurent Destailleur
d570aa02d4
Fix: bad url
2013-04-10 23:11:21 +02:00
Laurent Destailleur
3bcd506e73
Fix: demo modules list
2013-04-10 23:06:38 +02:00
BENKE Charles
e0cb09bd65
Update admin_extrafields.inc.php
...
$default_value not initialised
new type : sellist
2013-04-10 22:38:45 +03:00
Laurent Destailleur
4d0dd0d56c
Fix: Function to generate pdf
2013-04-10 20:50:05 +02:00
Laurent Destailleur
9dd201df10
Fix: Log
2013-04-10 20:47:39 +02:00
Laurent Destailleur
15e86875f3
Fix: sql syntax error
2013-04-10 20:45:38 +02:00
fhenry
98ddd02a32
Qual : PHP Code_Sniffer
2013-04-10 19:55:21 +02:00
Laurent Destailleur
70b7cb1fa3
Fix: Restore suffix
2013-04-10 19:50:54 +02:00
Laurent Destailleur
43d4bb6155
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-04-10 19:30:51 +02:00
Laurent Destailleur
72f0ca194c
Fix: Solve conflict of translation
2013-04-10 19:28:54 +02:00
Laurent Destailleur
f3adcc311d
Qual: Removed useless table
2013-04-10 18:34:19 +02:00
Laurent Destailleur
5197dedc59
Fix: Missing background
2013-04-10 18:33:58 +02:00
Laurent Destailleur
c4d0c4c3e5
Merge pull request #821 from FHenry/3.3
...
Fix bug : change path of ODT template for commande and propal module
2013-04-10 08:15:57 -07:00
Laurent Destailleur
a32a02e4c1
Fix: Removed warnings
2013-04-10 16:51:13 +02:00
fhenry
5d94b0c576
Fix bug : change path of ODT template for commande and propal module
2013-04-10 16:34:06 +02:00
Laurent Destailleur
d7c0cf3d50
Fix: More complete fix for emailing contact selectors.
2013-04-10 16:29:53 +02:00
Laurent Destailleur
c174dd9d05
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-10 16:16:12 +02:00
Laurent Destailleur
3d8c312a30
Fix: Uniformize column size
...
Fix: Use dol_prind_address for addressees
2013-04-10 16:15:35 +02:00
Laurent Destailleur
4f645b0a53
Fix: Bad width
2013-04-10 16:08:38 +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
Laurent Destailleur
6739ac4d94
Fix: Restore backward compatibility
2013-04-10 15:53:40 +02:00
Regis Houssin
ef4004c0ae
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-10 15:42:52 +02:00
Regis Houssin
b152e58793
Fix: change for experimental encyption
2013-04-10 15:42:21 +02:00
Regis Houssin
b80d4874e3
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2013-04-10 15:34:51 +02:00
Regis Houssin
057365b69e
Fix: change for experimental encryption
2013-04-10 15:33:03 +02:00
fhenry
38e30836a5
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
2013-04-10 15:08:03 +02:00
Laurent Destailleur
72aec6aa60
Better translation
2013-04-10 13:30: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
bc1469ff29
Fix: More complete function
2013-04-10 11:03:24 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
Laurent Destailleur
20e9eb5f8f
Fix: syntax error
2013-04-10 10:40:59 +02:00
Laurent Destailleur
7f6fa0bf0f
Fix: Enhance detection of html
2013-04-10 10:40:35 +02:00
Laurent Destailleur
e79d0f50d0
Fix: Regression
2013-04-10 00:08:55 +02:00
Laurent Destailleur
af6f075b5c
Qual: Better error management.
...
Qual: Uniformize code for canvas
2013-04-09 23:56:52 +02:00
Laurent Destailleur
cf52cbfab5
Fix: Better error management
2013-04-09 23:46:38 +02:00
Laurent Destailleur
6a519cd88c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-09 23:06:18 +02:00
Laurent Destailleur
538194f435
New: Add module opensurvey. Final. Test are welcome.
2013-04-09 23:05:50 +02:00
Laurent Destailleur
a4b56708e9
Better error management
2013-04-09 23:04:59 +02:00
fhenry
2ca18ace30
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-09 21:58:39 +02:00
fhenry
04e933c40f
Fix : admin ODT doctemplate path commande/project
2013-04-09 21:58:25 +02:00
Laurent Destailleur
2ab5c2029d
Merge pull request #817 from grandoc/develop
...
add supplier invoice extrafields and some fixes
2013-04-09 12:21:26 -07: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
Grand Philippe
c6106e1a8c
fix: Champ e.fk_expedition_methode inconnu dans field list
2013-04-09 12:03:49 +02:00
Grand Philippe
f4e58d71ed
add supplier invoice extrafields and some fixes
2013-04-09 09:38:25 +02:00
Laurent Destailleur
7b8be3eb87
Removed deprecated and not working code.
2013-04-09 01:29:29 +02:00
Laurent Destailleur
328801f455
Hide upload on smartphones
2013-04-09 01:27:41 +02:00
Laurent Destailleur
00eafa1cf2
Optimie for small screen
2013-04-09 01:25:16 +02:00
Laurent Destailleur
f17ba4814e
Merge pull request #816 from FHenry/3.3
...
Fix [ bug #810 ] Cannot update ODT template path
2013-04-08 14:28:51 -07:00
Laurent Destailleur
bba123c6ef
Merge pull request #815 from FHenry/develop
...
Fix bug on ODT template path for order and projects
2013-04-08 14:27:28 -07:00
Laurent Destailleur
898a3891e8
Merge pull request #814 from grandoc/develop
...
fix: wrong url
2013-04-08 14:26:15 -07:00
Grand Philippe
5b5b57d4e0
some fixes for supplier orders extrafields
2013-04-08 23:20:35 +02:00
Laurent Destailleur
7d2b11aff5
Qual: Remove a deprecated page, replaced by a more direct combo box.
2013-04-08 19:26:45 +02:00
fhenry
98aaec18a7
Fix [ bug #810 ] Cannot update ODT template path
2013-04-08 18:08:38 +02:00
fhenry
6379b74099
Fix bug on ODT template path for order and projects
2013-04-08 18:02:12 +02:00
Grand Philippe
832fa1fb31
prepair for insert ExtraFields
2013-04-08 17:46:01 +02:00
Laurent Destailleur
c6b66a9f4a
Normalize code
2013-04-08 17:42:24 +02:00
Grand Philippe
e54056b805
prepair for insert ExtraFields
2013-04-08 17:39:32 +02:00
Grand Philippe
fbe5947bc2
prepair for insert ExtraFields
2013-04-08 17:17:13 +02:00
Grand Philippe
d1ac79d9ef
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-04-08 16:22:03 +02:00
Grand Philippe
e21e08717e
normalize code
2013-04-08 16:06:57 +02:00
Grand Philippe
ea077e959b
normalize code
2013-04-08 14:57:06 +02:00
frederic34
9099fe9461
Merge remote-tracking branch 'upstream/develop' into develop
2013-04-08 14:24:25 +02:00
Grand Philippe
d7f2c9c480
some fixes for missing names
2013-04-08 14:21:42 +02:00
Grand Philippe
707ef0f378
some fixes for missing names
2013-04-08 14:12:46 +02:00
Grand Philippe
76929325f1
some fixes for missing names
2013-04-08 12:57:33 +02:00
Regis Houssin
f3bbfe375c
Fix: for multicompany compatibility
2013-04-08 12:41:48 +02:00
Regis Houssin
cea2f047a2
Fix: for multicompany compatibility
2013-04-08 12:38:51 +02:00
Grand Philippe
0eef6c7808
some fixes for wrong and missing names
2013-04-08 12:29:49 +02:00
Grand Philippe
79b3907ec9
some fixes for wrong and missing names
2013-04-08 12:18:19 +02:00
Grand Philippe
a593e5d4e5
fix: wrong url
2013-04-08 11:56:50 +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
fhenry
8efeb93812
Merge branch 'develop' into develop_orderextrafield
2013-04-08 09:45:43 +02:00
fhenry
a27b3a2119
Fix PostGreSQL blocking install : wrong SQL syntax
2013-04-08 09:45:11 +02:00
fhenry
52706117d9
Merge branch 'develop' into develop_orderextrafield
2013-04-07 23:54:33 +02:00
fhenry
393007625a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
2013-04-07 23:52:02 +02:00
Laurent Destailleur
4ce7a70411
Merge pull request #813 from marcosgdf/3.3
...
Removed duplicated code and fixed a problem with orders2invoice
2013-04-07 14:00:32 -07:00
Laurent Destailleur
3247ce2d1b
Merge pull request #811 from lrq3000/develop
...
update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)
2013-04-07 13:59:53 -07:00
Laurent Destailleur
826d8a329d
Merge pull request #802 from simnandez/develop
...
Fix: Try to showing the events related to a intervention
2013-04-07 13:54:53 -07:00
Marcos García
6013916d45
Removed duplicated code and fixed a problem with orders2invoice
2013-04-07 21:58:24 +02:00
Laurent Destailleur
12cae7ebdf
Fix: No warning if due date unknown
2013-04-07 21:13:48 +02:00
Laurent Destailleur
b678183ff2
Log
2013-04-07 21:09:57 +02:00
Laurent Destailleur
d0d146cabf
Translation
2013-04-07 20:15:03 +02:00
Laurent Destailleur
6e5f1c5d31
Fix: Some regressions
2013-04-07 17:57:17 +02:00
Laurent Destailleur
5c3e6de073
Qual: Mutualize code. Only one function to build address format.
2013-04-07 17:39:08 +02:00
Stephen L
6e1e41e8b5
update: Sync odtphp lib (fix a lot of bugs and add a few functionalities)
...
Ref: b4e02a1306
2013-04-07 17:27:35 +02:00
Laurent Destailleur
8e2171b64c
Fix: Error management and missing transactions check
2013-04-07 16:39:20 +02:00
simnandez
44bfc1db4a
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-04-07 15:53:31 +02:00
simnandez
9e8c3a1b1e
Updates
2013-04-07 15:45:48 +02:00
Laurent Destailleur
59dfab9d21
Fix: regresson after rename of fields
2013-04-07 15:43:21 +02:00
Laurent Destailleur
ff3c8ec0be
Fix: Better error management
2013-04-07 15:16:19 +02:00
fhenry
78571e4458
Merge branch 'develop' into develop_orderextrafield
2013-04-07 15:12:27 +02:00
fhenry
0427080a4e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_orderextrafield
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
2013-04-07 15:11:52 +02:00
fhenry
144ab24545
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
2013-04-07 15:08:47 +02:00
Laurent Destailleur
64a9689473
Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
...
payment
2013-04-07 14:41:42 +02:00
Laurent Destailleur
4ceeea4a1c
Fix: Can't reset payment due date
2013-04-07 14:41:08 +02:00
Laurent Destailleur
fafd426903
Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
...
payment
2013-04-07 14:40:13 +02:00
Laurent Destailleur
87b50f9ced
Fix: Can't reset payment due date
2013-04-07 14:36:22 +02:00
simnandez
7b70fc4bf3
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-04-07 14:30:44 +02:00
Laurent Destailleur
7e46a74fac
Fix: Remove warnings
2013-04-07 13:44:04 +02:00
Laurent Destailleur
4e5a71fb22
New: Add local and vat rate for peru
2013-04-06 18:59:22 +02:00
Laurent Destailleur
eaab6d0caa
Trans: For peru, IVA is IGV
2013-04-06 18:51:07 +02:00
Marcos García
6252857440
Fixed translations and BILL_SUPPLIER_BUILDDOC trigger
2013-04-06 17:56:10 +02:00
Laurent Destailleur
88858136fc
New: Enhance agenda module to reach RFC2445 (add busy information).
2013-04-06 17:39:31 +02:00
Laurent Destailleur
ee2a2f7b48
Missing space
2013-04-06 16:43:26 +02:00
Laurent Destailleur
d863a0b1bd
Fix: syntax error
2013-04-06 16:21:34 +02:00
Laurent Destailleur
25ec7eed6d
New: Can send email to warn when payment for subscription is payed.
2013-04-06 16:14:28 +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
48b510dd45
Same bug fixing
2013-04-06 12:42:54 +02:00
fhenry
e5bdcdcadb
Same bug fixing
2013-04-06 12:37:38 +02:00
fhenry
7d2ba5f1b3
Fix bug : create supplier invoice ($infos_bits instead of $info_bits)
...
in updateline sql query
2013-04-06 12:35:35 +02:00
fhenry
cc465380da
Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry)
2013-04-06 12:20:19 +02:00
fhenry
b7137606ee
Merge branch 'develop' into develop_orderextrafield
...
Conflicts:
htdocs/commande/fiche.php
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
2013-04-06 10:41:29 +02:00
simnandez
50548601ce
Resolve conflicts
2013-04-06 08:20:57 +02:00
Laurent Destailleur
f22b1d3678
Enhance specimens
2013-04-06 03:40:55 +02:00
Laurent Destailleur
bd1d9b719b
More generic specimen data
2013-04-06 00:37:20 +02:00
Laurent Destailleur
adf47d6975
Qual: Uniformise columns
2013-04-06 00:34:33 +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
Laurent Destailleur
815bb82b0e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-05 22:51:19 +02:00
Laurent Destailleur
c10f2dd327
Merge pull request #807 from FHenry/3.3_bug794
...
Fix [ bug #794 ] Lost filter on zipwode in prospect list
2013-04-05 13:50:27 -07:00
Laurent Destailleur
5f2ea4c65c
Merge pull request #804 from atm-maxime/develop
...
Fixes on invoice payment list and for price by quantity
2013-04-05 13:49:52 -07:00
Laurent Destailleur
bbb0854517
Merge pull request #803 from FHenry/3.3
...
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
2013-04-05 13:49:11 -07:00
Laurent Destailleur
a3c5db968e
Merge pull request #800 from FHenry/develop
...
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-05 13:39:52 -07:00
Laurent Destailleur
a5f72bfb4e
Fix: Some fix after patch merge.
2013-04-05 22:38:46 +02:00
Laurent Destailleur
49c9df3688
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-05 22:29:21 +02:00
Laurent Destailleur
7ebd24daea
Merge pull request #805 from zedzedtop/develop
...
Develop
2013-04-05 13:28:58 -07:00
Laurent Destailleur
b47765f721
Optimize for smartphones
2013-04-05 22:26:41 +02:00
Laurent Destailleur
1fb3159045
Qual: Uniformize code
2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df
Fix: Do not loose value dol_use_jmobile when using not connected pages
...
(support and forget password)
2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff
Look: Replace table with div
2013-04-05 17:39:27 +02:00
Laurent Destailleur
ff4c9c495a
Fix: Uniformize field names
2013-04-05 13:35:09 +02:00
Laurent Destailleur
71716dcab5
Ref: sql file not up to date
2013-04-05 13:33:48 +02:00
fhenry
09d1e56ca5
Fix [ bug #794 ] Lost filter on zipwode in prospect list
2013-04-05 13:01:15 +02:00
fhenry
dfcb38d13f
[ task #793 ] Add extrafield feature into Orders module
2013-04-05 12:43:00 +02:00
fhenry
dcd960a957
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
2013-04-05 11:46:09 +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
Laurent Destailleur
d8a86453e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136
Optimize size of graph
2013-04-04 21:13:51 +02:00
Laurent Destailleur
58bb2df24c
Qual: Uniformize columns
2013-04-04 20:58:42 +02:00
Maxime Kohlhaas
9530e103e8
Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one
2013-04-04 20:44:00 +02:00
Maxime Kohlhaas
e5085b2a1c
Fix : filter on payment type was not working (int instead of char)
2013-04-04 20:19:42 +02:00
fhenry
ef5c03fc99
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
2013-04-04 19:57:16 +02:00
Laurent Destailleur
607ebbfe8b
Qual: Replace tab with div
2013-04-04 19:42:21 +02:00
juanjo
61b28274f7
[ bug #790 ] Spanish localtax RE not being correctly calculated
2013-04-04 16:32:06 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
4996a4b217
Fix: regex not complete
2013-04-04 12:23:12 +02:00
Laurent Destailleur
281cd49f32
Merge pull request #798 from lrq3000/develop3
...
Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for ...
2013-04-04 02:36:30 -07:00
Laurent Destailleur
bf23efda21
Fix: Bad error management
2013-04-04 09:17:03 +02:00
Laurent Destailleur
e06e0127af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-04 09:11:37 +02:00
Laurent Destailleur
d08eb386ab
Fix: cursor
2013-04-04 09:03:13 +02:00
Regis Houssin
06485b065b
Fix: bug #791
2013-04-04 08:56:19 +02:00
Laurent Destailleur
fca3153c2b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-03 19:08:31 +02:00
Regis Houssin
d474955d56
Fix: missing renaming field !!
2013-04-03 18:54:44 +02:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Laurent Destailleur
7f15154c6b
Qual: Uniformize skins code.
2013-04-03 15:45:06 +02:00
Laurent Destailleur
545ac638b0
Qual: Removed deprecated code for using a specific mobile theme.
...
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +02:00
fhenry
be01297403
Fix Ducth (nl_NL) translation
2013-04-03 11:56:54 +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
3312e620b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-03 00:37:05 +02:00
Laurent Destailleur
08be243dc4
Optimize with smartphone
2013-04-03 00:36:31 +02:00
fhenry
9572eebae0
Check style
...
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde )
2013-04-02 22:22:57 +02:00
Laurent Destailleur
3590ae8eaa
Merge pull request #794 from grandoc/develop
...
fix: some issue on the road to numbering supplier invoice
2013-04-02 07:07:57 -07:00
Laurent Destailleur
21e8eb65fe
Merge pull request #795 from FHenry/develop
...
[ task #783 ] Add checkbox and radio into extrafield feature
2013-04-02 07:06:34 -07:00
jfefe
50e620e839
Better management for linked objects on intervention card.
...
- Display linked object as invoice
- When origin & originid defined, page was blank after submit creation form
2013-04-02 15:34:45 +02:00
fhenry
ae00d8b214
Add import_key into llx_product_price
2013-04-02 15:03:01 +02:00
fhenry
735e107a51
Better error management on extrafailed input
2013-04-02 14:12:21 +02:00
fhenry
e93b6141e1
Add translation for extrafield
2013-04-02 12:04:37 +02:00
Régis Houssin
e139e63d92
Fix: missing $soc object with origin object
2013-04-02 12:01:39 +02:00
fhenry
893fed9284
[ task #783 ] Add checkbox and radio into extrafield feature
2013-04-02 11:56:53 +02:00
fhenry
d03fb5d363
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-02 10:53:29 +02:00
fhenry
489d62dbf1
Better extrafield date management
2013-04-02 10:52:39 +02:00
Laurent Destailleur
f98e40f694
Optimize for smartphone
2013-04-02 10:26:11 +02:00
Grand Philippe
cdbffe2d0a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-04-02 08:50:35 +02:00
Laurent Destailleur
6b13e8242a
Fix: Restore backward compatibility
2013-04-01 23:47:48 +02:00
Laurent Destailleur
147032edcb
Qual: Removed deprecated theme.
2013-04-01 23:42:32 +02:00
Laurent Destailleur
c8bc0a1ec9
New: Prepare to code to support jmobile.
2013-04-01 23:38:39 +02:00
Grand Philippe
8dd8ccad2e
fix: some issue on the road to numbering supplier invoice
2013-04-01 23:28:44 +02:00
Laurent Destailleur
aba9fd8fc5
Fix: Nowrap
2013-04-01 23:01:38 +02:00
Grand Philippe
20fb7f79c0
fix: some issue on the road to numbering supplier invoice
2013-04-01 22:58:54 +02:00
Laurent Destailleur
29a1640b4c
Qual: Normalize field ref_supplier into supplier invoices (replace
...
facnumber).
2013-04-01 22:39:27 +02:00
Laurent Destailleur
110d0f1d3b
Fix: Better error management
2013-04-01 22:35:54 +02:00
Laurent Destailleur
954af0f6c7
New: Add option INVOICE_CAN_NEVER_BE_REMOVED
2013-04-01 22:17:51 +02:00
Laurent Destailleur
80e34c8e1c
New: Add option INVOICE_CAN_NEVER_BE_REMOVED
2013-04-01 22:16:55 +02:00
Laurent Destailleur
ef6e06bcaa
Fix: Default background if css3 not used
2013-04-01 21:55:59 +02:00
Laurent Destailleur
eaff41c65f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-01 21:01:44 +02:00
Laurent Destailleur
cf4603f5af
Merge pull request #793 from jfefe/extrafields
...
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
2013-04-01 12:00:08 -07:00
Laurent Destailleur
7d32db73c6
Fix: Restore lost commit.
2013-04-01 20:59:51 +02:00
Laurent Destailleur
07fc55de4b
Merge pull request #792 from grandoc/develop
...
try to fix :supplier invoice numbering
2013-04-01 11:57:02 -07:00
Laurent Destailleur
9449345395
Another step for menu management rewriting
2013-04-01 20:15:52 +02:00
jfefe
cf6f4405cb
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
...
Conflicts:
htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8
Uniformize usage of extrafields methods
2013-04-01 19:43:26 +02:00
jfefe
7ca7c552c0
Use new function to show extrafields on products
2013-04-01 18:59:41 +02:00
jfefe
ec52f54a52
Unique function to show input or output of extrafields datas
2013-04-01 18:59:05 +02:00
jfefe
6e66922a6b
Fix : in extrafield force output for date selector
2013-04-01 18:46:53 +02:00
Grand Philippe
e2623c6ad5
try to fix :supplier invoice numbering
2013-04-01 16:04:15 +02:00
Laurent Destailleur
3c37f89d2e
Work on new menu managers - step x
2013-04-01 16:02:16 +02:00
Laurent Destailleur
bbe68e341c
Fix: dol_hide_topmenu and dol_hide_leftmenu not lost after logout
2013-04-01 15:28:53 +02:00
Laurent Destailleur
df08d838d7
More robust phpunit tests
2013-04-01 14:49:33 +02:00
Laurent Destailleur
e352e4a56f
New: Work on new menu management.
2013-03-31 19:54:56 +02:00
Laurent Destailleur
d752a41f05
Add helper
2013-03-31 16:51:49 +02:00
Laurent Destailleur
cc69cf7b76
New: Can defined a clicktodial setup per user
2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047
New: ClickToDial setup is easier
2013-03-31 04:03:08 +02:00
Laurent Destailleur
dca3179bfe
New: Support __LOGIN__ and __USERID__ on left menu entries
2013-03-30 21:29:14 +01:00
Laurent Destailleur
fa6e9d2d47
Missing trans key
2013-03-30 21:25:37 +01:00
Laurent Destailleur
a5799b3ae8
Trans for SMS
2013-03-30 21:25:00 +01:00
Laurent Destailleur
ef571de960
New: Support __USERID__ into menu entries
2013-03-30 20:34:13 +01:00
Laurent Destailleur
79f40f27b3
Removed entry specific to external module
2013-03-30 20:33:42 +01:00
Laurent Destailleur
0b9602e4e6
Optionnal entries at end
2013-03-30 20:32:50 +01:00
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
Laurent Destailleur
fe895adb95
Fix: Bad div
2013-03-30 19:37:09 +01:00
Laurent Destailleur
4c1f17f42f
Qual: More robust error management for menu description
2013-03-30 19:11:52 +01:00
jfefe
2b587e1742
For thirdparty use new method to display extrafield values
2013-03-30 18:54:51 +01:00
Laurent Destailleur
000fe2c864
New: Better error management for add/remove of memeber into mailman.
2013-03-30 18:04:33 +01:00
jfefe
1ab1d74c77
New option (MAIN_EXTRAFIELDS_USE_TWO_COLUMS) to split extrafields display into 2 columns
2013-03-30 17:52:59 +01:00
jfefe
3fe1b26136
New method to CommonObject to display extrafields data output
...
Try for product
2013-03-30 17:43:21 +01:00
jfefe
bd4e62a5e7
Implement extrafields : calendar on date type and new separator type
2013-03-30 16:58:49 +01:00
Laurent Destailleur
1eec85da9d
Merge pull request #791 from grandoc/develop
...
Develop
2013-03-30 07:58:48 -07:00
Laurent Destailleur
4208f11d87
Enhance fixutf8bomfiles and fixdosfiles tools.
2013-03-30 15:57:54 +01:00
Grand Philippe
671837bfcc
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-30 14:32:17 +01:00
Grand Philippe
ee7490a30a
fix : language error
2013-03-30 14:31:10 +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
3c23a717fd
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/core/lib/files.lib.php
2013-03-30 14:10:15 +01:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
Laurent Destailleur
c75ce97960
Update es_MX
2013-03-30 13:30:44 +01:00
Laurent Destailleur
3c248ce1fe
Merge pull request #790 from jfefe/extrafields
...
Work on task #784 : display calendar into data type extrafields
2013-03-30 05:27:14 -07:00
Laurent Destailleur
7caa715fea
Merge pull request #787 from grandoc/develop
...
add numbering for supplier invoice
2013-03-30 05:23:45 -07:00
Laurent Destailleur
656e61b77d
Merge pull request #788 from atm-maxime/develop
...
Fix : "Firstname" was used as var instead of "firstname"
2013-03-30 05:21:38 -07:00
jfefe
95d8ee8b41
Revert "Show number with dot to avoid error when update extrafield"
...
This reverts commit 76efc04840
2013-03-30 10:49:52 +01:00
jfefe
e99ba51f1d
Use of new function to set optionals from add / update form
...
Format date display for data from JS calendar (date type extrafield)
2013-03-30 10:46:23 +01:00
Grand Philippe
1ccdbbed5e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-30 10:02:50 +01:00
jfefe
f3a7d497c6
Fix : missing object when calling function
2013-03-29 22:30:07 +01:00
jfefe
6c872395e3
Fix: syntax error
2013-03-29 22:26:25 +01:00
jfefe
60e72a770a
Merge branch 'develop' into extrafields
2013-03-29 22:25:48 +01:00
jfefe
649c1f3721
Try new function to set array_options to object (extrafields values) with date sent by forms
2013-03-29 22:25:02 +01:00
jfefe
6aae37493c
Add support of calendar on date type extrafield on propal
2013-03-29 22:14:06 +01:00
BENKE Charles
701814ad19
Update mysqli.class.php
2013-03-29 21:19:22 +01:00
Maxime Kohlhaas
2309a4b81b
Fix : on holiday list on a specific user, user and validator were not displayed
2013-03-29 18:56:01 +01:00
Maxime Kohlhaas
d8090ba994
Fix : "Firstname" was used as var instead of "firstname"
2013-03-29 18:47:53 +01:00
Laurent Destailleur
e40909144d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-29 18:30:05 +01:00
Grand Philippe
11d2cb1e1c
fix: ref_suplier instead of ref for add numbering for supplier invoice
2013-03-29 17:18:47 +01:00
Laurent Destailleur
97a90b0904
New: Add more ODT tags
2013-03-29 16:45:40 +01:00
Laurent Destailleur
ff5b2b3404
Merge pull request #786 from defrance69/patch-21
...
Update mysql.class.php
2013-03-29 08:32:17 -07:00
Laurent Destailleur
4c47393b51
Fix: Add more ODT tags
2013-03-29 16:18:55 +01:00
Laurent Destailleur
8f331adff6
New: Work on men management rewrite
2013-03-29 16:16:26 +01:00
Laurent Destailleur
006050b6cd
Fix: left menu not always opened
2013-03-29 15:39:35 +01:00
Grand Philippe
f57320e697
add numbering for supplier invoice
2013-03-29 15:36:54 +01:00
jfefe
1a1aebf793
Display date extrafield with correct format
2013-03-29 14:56:31 +01:00
Laurent Destailleur
6702386b8b
Some fix into chineese language files
2013-03-29 14:54:07 +01:00
jfefe
80f080f5a9
Format date for sql query
...
Using dol_print_date because db->idate doesn't work
2013-03-29 14:45:40 +01:00
jfefe
c1e6de33eb
Fix : bad definition of key for extrafields array
2013-03-29 14:37:29 +01:00
jfefe
76ce938f61
When retrieve extrafields, loop on extralabels array instead of posted values
...
Add support for calendar display on date extrafield
2013-03-29 14:09:47 +01:00
jfefe
c53564c454
For extrafield with date type show calendar instead basic input field
2013-03-29 14:03:39 +01:00
Regis Houssin
1e3b26a104
Fix: file with a specific mask not found, again
2013-03-29 11:54:22 +01:00
Regis Houssin
888da9f3e9
Fix: file with a specific mask not found
2013-03-29 11:52:18 +01:00
jfefe
520e235207
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
2013-03-29 10:44:35 +01:00
BENKE Charles
d5a1f64e76
Update mysql.class.php
...
some other problems about DDLCreateTable, other field setting not actived
2013-03-29 02:09:19 +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
e745cbb5cf
Add missing column into llx_extrafield creation
2013-03-28 22:13:04 +01:00
fhenry
c2be118efd
Add more information in ODT project template
2013-03-28 20:51:00 +01:00
Laurent Destailleur
8ad801d0b6
Merge pull request #784 from jfefe/extra_error
...
Better error management when add/update extrafields
2013-03-28 11:12:58 -07:00
Laurent Destailleur
4e97a41612
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-28 16:29:22 +01:00
Laurent Destailleur
3c3c0b456e
Fix: _ not allowed into prestashop tags.
2013-03-28 09:59:59 +01:00
Sébastien de Chateauvieux
5921033f94
TVA NPR : Change field name recuperableonly to info_bits
2013-03-28 09:51:49 +04:00
jfefe
ed2b359dae
Bad parameter when calling setEventMessage function
2013-03-28 06:48:21 +01:00
Sébastien de Chateauvieux
eda6187982
TVA NPR : can use * in tva when set supplier price
2013-03-28 09:30:42 +04: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
013eac1147
Better error management when add/update extrafield
...
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
Laurent Destailleur
15b7a63b7a
Merge remote-tracking branch 'origin/3.3' into develop
2013-03-27 20:50:58 +01:00
Laurent Destailleur
e0bf4faa4c
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-03-27 20:49:30 +01:00
Laurent Destailleur
0108ee2bd8
Fix: Bad name of function
2013-03-27 20:48:57 +01:00
Laurent Destailleur
753bfdbec2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-27 20:43:43 +01:00
Laurent Destailleur
0a3b7e7994
New: Be able to get path of image without tag img
2013-03-27 20:43:28 +01:00
Regis Houssin
55757a6b82
Fix: $i is global
2013-03-27 20:42:55 +01:00
jfefe
0b7d13d463
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
2013-03-27 20:39:56 +01:00
jfefe
1f5987b379
Fix trad & add english
2013-03-27 19:13:50 +01: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
Laurent Destailleur
f27f601a73
Merge pull request #780 from FHenry/develop
...
Add information on Project ODT into ODT project
2013-03-27 07:56:33 -07:00
jfefe
ee52e1a487
Merge remote-tracking branch 'upstream/develop' into propal_odt_choice
2013-03-27 15:25:13 +01:00
jfefe
47b6829e17
Remove DOS EOF (dos2unix utility used)
2013-03-27 14:39:41 +01:00
Laurent Destailleur
6c1bbd3aeb
New: Uniformize hooks.
2013-03-27 14:24:33 +01:00
Laurent Destailleur
a22d39adfb
Fix: Hook is a replaceadd hook.
2013-03-27 14:11:15 +01:00
Laurent Destailleur
393cecb1c2
New: Add hook
2013-03-27 14:08:15 +01:00
Laurent Destailleur
982b3e9d66
Add trigger into delete line for supplier invoice
2013-03-27 13:59:45 +01:00
Laurent Destailleur
d8eafbf068
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-27 13:24:39 +01:00
Laurent Destailleur
da8932f987
Some fix for cron module
2013-03-27 13:24:26 +01:00
Regis Houssin
ce8631619a
Fix: avoid errors due to BROKEN FEATURES !!!
2013-03-27 11:55:14 +01:00
Regis Houssin
c36f52c47a
Fix: avoid errors due to BROKEN FEATURES !!!
2013-03-27 11:54:10 +01:00
fhenry
6494764e76
Add copy files ODT project on install
2013-03-27 11:24:57 +01:00
fhenry
9507f4258b
Add inforamtion on Project into ODT project
2013-03-26 23:32:22 +01:00
Laurent Destailleur
8c053b2f8d
Debug module cron
2013-03-26 21:18:01 +01:00
Laurent Destailleur
0a4f96e93a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-26 20:58:05 +01:00
Laurent Destailleur
19ae4a75d6
Qual: More robust function to run jobs
2013-03-26 20:57:24 +01:00
Regis Houssin
e75c609a0a
Fix: wrong var name
2013-03-26 18:33:44 +01:00
Regis Houssin
b5d13dc6e6
Fix: missing parameter
2013-03-26 18:33:23 +01:00
Regis Houssin
e9a8457d7e
Fix: broken features due to the removal of the trigger FILE_UPLOAD !
2013-03-26 18:33:14 +01:00
Regis Houssin
61826b04d8
Fix: broken feature for use hooks with dol_move_uploaded_file method
2013-03-26 18:33:06 +01:00
Regis Houssin
a701cbd77c
Fix: wrong var name
2013-03-26 17:47:37 +01:00
Laurent Destailleur
b694451ab2
Use engine instead of type
2013-03-26 17:45:07 +01:00
Regis Houssin
4fe94b800b
Fix: missing parameter
2013-03-26 17:43:48 +01:00
Laurent Destailleur
676f59fb6d
Merge pull request #779 from defrance69/patch-20
...
Update mysql.class.php
2013-03-26 09:43:46 -07:00
Regis Houssin
dff74667c2
Fix: broken features due to the removal of the trigger FILE_UPLOAD !
2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e
Fix: broken feature for use hooks with dol_move_uploaded_file method
2013-03-26 17:12:00 +01:00
BENKE Charles
2c56a1c8dc
Update mysql.class.php
...
Create Table 'type' not supported on recent mysql databases, need to use 'engine' instead
2013-03-26 16:49:02 +01:00
simnandez
26d2e3d928
Fix: [ bug #777 ] Withdrawal receipt set Credited
2013-03-26 15:48:12 +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
Regis Houssin
26f120cbc7
Fix: move doctemplates in install directory
2013-03-26 08:57:37 +01:00
Sébastien de Chateauvieux
28999af70b
TVA NPR : set function get_default_npr
2013-03-26 08:47:17 +04:00
Sébastien de Chateauvieux
148ad65150
TVA NPR : deduplicate line. Remove tva npr from journal lines
2013-03-26 08:11:06 +04:00
Sébastien de Chateauvieux
bbbc4ad8c4
TVA NPR: add parameter in function call. Accept * tva
2013-03-26 07:57:19 +04: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
Laurent Destailleur
10d7fad524
Merge pull request #775 from defrance69/patch-19
...
Update modAgenda.class.php
2013-03-25 15:49:54 -07:00
fhenry
b5751ab658
Add copyright
2013-03-25 19:31:17 +01: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
Maxime Kohlhaas
83def2cd57
Fix : on a new trigger, using $this but not in a class...
2013-03-25 18:03:42 +01:00
Laurent Destailleur
6a34250712
Rewrite module manager. Next step.
2013-03-25 17:54:54 +01:00
Sébastien de Chateauvieux
aaaa5242d6
TVA NP : update price calculation
2013-03-25 17:42:48 +04:00
Sébastien de Chateauvieux
b2b0d1616d
TVA NPR : add fourn_tva_npr property in class ProductFournisseur
2013-03-25 17:32:22 +04:00
Sébastien de Chateauvieux
6cfedfff9f
TVA NPR : add info_bits property in class FactureFournisseur
2013-03-25 17:18:10 +04:00
Laurent Destailleur
75c15ee9a1
New: Revenue stamps works for invoices
2013-03-25 13:04:03 +01:00
Laurent Destailleur
4b1c9c1a0d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-25 12:29:30 +01:00
Laurent Destailleur
dc0c1a2c85
Fix: [ bug #729 ] incorrect unpaid invoice list
2013-03-25 12:20:24 +01:00
Sébastien de Chateauvieux
be8a95a22b
Mise à jour des tables facture_fourn_det et product_fournisseur_price. Ajout d'un champ pour la gestion de la TVA NPR
2013-03-25 13:03:37 +04:00
fhenry
7881502b52
[ task #773 ] Add Project document in GED(ECM) modules
2013-03-25 09:56:07 +01:00
Laurent Destailleur
4fb4734eed
Merge pull request #772 from grandoc/develop
...
fix : trad error
2013-03-24 15:08:24 -07:00
Regis Houssin
86b521287c
Fix: upgrade all files
2013-03-24 22:05:46 +01:00
Regis Houssin
eaf914cada
Fix: upgrade jQuery datatables with 1.9.4 for avoid problems
2013-03-24 21:33:35 +01:00
Laurent Destailleur
4e029bf2ca
Fix: Security does not need special case
2013-03-24 21:06:45 +01:00
Laurent Destailleur
85cafee19f
New: Add substitutions keys in view
2013-03-24 19:06:20 +01:00
Laurent Destailleur
b3d4811b6f
New: Another method to allow style tags into email.
...
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
2013-03-24 19:00:58 +01:00
Laurent Destailleur
3ef8bf55fa
Fix: Better line position of information
2013-03-24 16:17:36 +01:00
Laurent Destailleur
d4d3b9900d
Fix: creation of user
2013-03-24 14:11:10 +01:00
Laurent Destailleur
ff2407a454
Add hidden option to setup font size of information.
2013-03-24 14:01:33 +01:00
