Commit Graph

4868 Commits

Author SHA1 Message Date
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier
invoices.
2013-09-18 16:46:54 +02:00
simnandez
f7299f1a28 [ task #1063 ] Allow edit localtaxes rate for thirds 2013-09-17 18:06:06 +02:00
BENKE Charles
a6335c44fe Update companies.lang 2013-09-17 10:36:21 +02:00
BENKE Charles
1e34bc26bc Update companies.lang 2013-09-17 10:35:41 +02:00
Laurent Destailleur
949b8c6274 Mark method classer_facturee deprecated.
Make better translation of some workflow options.
2013-09-16 11:50:53 +02:00
Christophe Battarel
33fbee51bd ability to copy contact address to clipboard 2013-09-15 19:09:22 +02:00
Laurent Destailleur
e970c01b1b Code comment
Fix translation
2013-09-15 12:17:45 +02:00
Laurent Destailleur
4c1faf626e Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 14:36:17 +02:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
5344aadc2e Fix: Bad translation 2013-09-14 12:51:01 +02:00
Laurent Destailleur
ad851a6432 Added language fr_NC 2013-09-10 01:44:21 +02:00
Cédric Salvador
de1dec7c34 don't display warehouse selection if there's only one
Conflicts:
	htdocs/compta/facture.php
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang
2013-09-09 09:55:51 +02:00
Laurent Destailleur
2685c47185 Download transifex changes 2013-09-08 00:52:48 +02:00
Cédric Salvador
6015a36183 filter on stock alert 2013-09-06 09:56:06 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
Laurent Destailleur
64b44298ae Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-03 18:19:15 +02:00
simnandez
6ae3603549 Trad: Add missing translations 2013-09-03 18:16:30 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
simnandez
614f376392 Trad: Fix bad descriptor 2013-09-03 09:25:14 +02:00
Laurent Destailleur
b02bf5a2a7 Syn with transifex 2013-09-03 00:42:54 +02:00
Laurent Destailleur
20b92ca4d7 Merge pull request #1160 from defrance69/patch-10
Update index.php
2013-09-01 15:20:57 -07:00
Laurent Destailleur
1ba382d7a6 Merge pull request #1202 from FHenry/develop
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Florian Henry
9ed5653ae5 [ task #1044 ] Add option to enabled thirdparty number into select
thirdparty list
2013-08-30 18:18:58 +02:00
simnandez
2a8aa50163 Fix: Intervention box links to contracts id
Conflicts:
	htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6 Fix: Intervention box links to contracts id 2013-08-29 12:05:29 +02:00
Laurent Destailleur
83c3bde1bd Merge pull request #1197 from grandoc/develop
some fix for contract model and clean code
2013-08-26 14:10:08 -07:00
Grand Philippe
2591fa95f0 some trad for contract model 2013-08-26 15:07:36 +02:00
simnandez
c78b0dbcc6 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 13:00:47 +02:00
simnandez
a796337fc6 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 12:41:35 +02:00
simnandez
a9772edeff Trad: Add ca_ES and es_ES boxes translations 2013-08-26 12:31:41 +02:00
simnandez
8fa9e3251e Trad: Update ca_ES and es_ES translations 2013-08-26 12:17:11 +02:00
simnandez
68b4278ec6 Add ca_ES and es_ES workflow translations 2013-08-26 12:03:17 +02:00
simnandez
f5947abc71 Trad: Add ca_ES and es_ES boxes translations 2013-08-26 11:49:22 +02:00
Laurent Destailleur
67892575be Merge pull request #1167 from PaulPoulain/999-develop
T999-develop: link invoice to a command
2013-08-25 03:23:57 -07:00
Laurent Destailleur
4eb37abed9 New: Translate the email to change password. 2013-08-25 06:53:59 +02:00
Laurent Destailleur
4ec85e6722 Update romanian language files
Added vietnamese language files
2013-08-25 01:38:31 +02:00
Laurent Destailleur
07cba2d232 Merge pull request #1194 from grandoc/develop
fix : warning during install
2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.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/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.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/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.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/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
1c08cad6b9 Fix: Bad translation (to pick to 3.4)
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
2013-08-24 21:41:36 +02:00
Grand Philippe
fcd748eedb first step to complete contract functionalities 2013-08-24 16:16:42 +02:00
Laurent Destailleur
c1dae58055 Fix: Bad translation (to pick to 3.4) 2013-08-22 12:46:10 +02:00
lalaina rasamoelina
f913422e62 T999-develop: link invoice to a command
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
2013-08-22 10:17:03 +02:00
Laurent Destailleur
ff4ebe423b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-09 19:21:32 +02:00
simnandez
ee107a64b4 Trad: Update ca_ES dict.lang 2013-08-09 15:33:31 +02:00
simnandez
23be083637 Trad: Update ca_ES exports.lang 2013-08-09 15:31:40 +02:00
simnandez
2ae3af7851 Trad: Update ca_ES other.lang 2013-08-09 15:29:30 +02:00
simnandez
1b1f44edbb Trad: Update ca_ES commercial.lang 2013-08-09 15:27:48 +02:00
simnandez
b54fc29a07 Trad: Update ca_ES suppliers.lang 2013-08-09 15:25:55 +02:00