Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 01:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,329 Commits 36 Branches 190 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

4492 Commits

Author SHA1 Message Date
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +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
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
afbe6c1808 Fix: translation 2013-06-08 14:56:40 +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
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +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
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
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
4be5ffc937 Fix: Syntax error 2013-05-26 15:38:17 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +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
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
Marcos García
0a5bb491d3 Corrected translation key BuyingPrice from lang files 2013-05-19 12:24:19 +02:00
Marcos García
08b234ed01 Corrected translation key BuyingPrice from lang files 2013-05-19 12:08:18 +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
Laurent Destailleur
85eac29925 New: Add balance before and after column 2013-05-15 19:30:32 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +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
dc28335ed5 Merge pull request #948 from marcosgdf/translations 
Improved translations
 2013-05-13 16:07:22 -07:00
Laurent Destailleur
80817fd8fb Fix: translation 2013-05-14 01:04:21 +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
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
simnandez
050ca946e9 Fix: Debug of withdrawals rejects 2013-05-13 16:30:52 +02:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +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
zcattacz
a25fe2e59d Adjust word order 2013-05-12 16:42:43 +08:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
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
simnandez
7358faeb96 New: [ task #812 ] Add more Scripts. expire contract services ordered by 
date end
 2013-05-09 09:41:32 +02:00
Marcos García
e86a742383 Added missing translations 2013-05-08 17:56:32 +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
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +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
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
simnandez
ca9a2b281a New: [ task #812 ] Add more Scripts. expire contract services to 
representatives
 2013-05-07 12:52:14 +02:00
Marcos García
9f537cedd1 Replaced "Jours" with DurationDays translation key 2013-05-06 17:48:20 +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
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00