Commit Graph

5142 Commits

Author SHA1 Message Date
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
simnandez
f0445cd7a0 Trad: Update ca_ES languages.lang 2013-08-09 15:23:41 +02:00
simnandez
7eecf88c8c Trad: Update ca_ES ftp.lang 2013-08-09 15:21:22 +02:00
simnandez
25e970757e Trad: Update ca_ES paypal.lang 2013-08-09 15:18:06 +02:00
simnandez
911b4965a2 Trad: Update ca_ES donations.lang 2013-08-09 15:16:04 +02:00
simnandez
e2cc4a9545 Trad: Update ca_ES externalsite.lang 2013-08-09 15:12:44 +02:00
simnandez
a2005ed603 Trad: Update ca_ES mailmanspip.lang 2013-08-09 15:10:10 +02:00
Laurent Destailleur
0621233b9a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-09 13:26:51 +02:00
Laurent Destailleur
b4f040bc63 Synchronize romania from transifex. 2013-08-09 13:20:34 +02:00
simnandez
057df6df85 Trad: Update ca_ES and es_ES admin.lang 2013-08-09 11:50:12 +02:00
simnandez
868571061b Trad: Update ca_ES and es_ES bills.lang 2013-08-09 11:44:12 +02:00
simnandez
728edd0ab3 Trad: Update ca_ES and es_ES companies.lang 2013-08-09 11:41:27 +02:00
simnandez
a79cb97235 Trad: Update ca_ES and es_ES main.lang 2013-08-09 11:37:39 +02:00
simnandez
e762f76d86 Trad: Update ca_ES and es_ES users.lang 2013-08-09 11:32:35 +02:00
simnandez
372ef135d5 Trad: Update ca_ES and es_ES commercial.lang 2013-08-09 11:28:24 +02:00
simnandez
f853039b2f Trad: Update ca_ES and es_ES ecm.lang 2013-08-09 11:26:12 +02:00
simnandez
55436940e1 Trad: Update ca_ES and es_ES holiday.lang 2013-08-09 11:19:59 +02:00
simnandez
a7431c1165 Trad: Update ca_ES and es_ES banks.lang 2013-08-09 11:10:52 +02:00
simnandez
3aa9de7cfa Trad: Update ca_ES and es_ES interventions.lang 2013-08-09 10:57:41 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
Laurent Destailleur
b7dd059f99 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-08 01:54:22 +02:00
Laurent Destailleur
2a0597a6d4 Merge pull request #1161 from PaulPoulain/948-develop
T948-develop :Classify Billed when the price of bill is greater than command
2013-08-07 16:48:32 -07:00
Laurent Destailleur
fe3e59ed12 Fix: Use reserved word None when we don't want thousand separator. 2013-08-08 01:47:22 +02:00
BENKE Charles
2548274c10 Update products.lang
add header translation
2013-08-07 07:32:27 +02:00
Laurent Destailleur
7438809ab5 Make predefined invoice feature easier to use. 2013-08-06 23:55:17 +02:00
Laurent Destailleur
837c34ba62 Qual: Add more complete help text into setup page. 2013-08-06 17:26:26 +02:00