Commit Graph

37168 Commits

Author SHA1 Message Date
Laurent Léonard
ec86efaab2 Fix owner address of company bank account 2013-09-03 23:57:36 +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
c041774950 Trans: First try to commit files pulled from transifex. 2013-05-26 15:37:50 +02:00
Laurent Destailleur
a3f1169cd4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-26 14:47:25 +02:00
Laurent Destailleur
600598e591 Work on transifex 2013-05-26 14:47:06 +02:00
Laurent Destailleur
dacd5e98cf Merge pull request #989 from zcattacz/zh_CN
Update zh_CN translation
2013-05-26 05:43:38 -07:00
Laurent Destailleur
ff5a900ea3 Work on automation of transifex 2013-05-26 14:13:49 +02:00
Laurent Destailleur
e41542a219 Start to test transifex 2013-05-26 13:57:55 +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
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
Regis Houssin
b9695ddc2b Fix: wrong field name 2013-05-25 19:02:06 +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
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
Laurent Destailleur
982fec65ec Merge pull request #984 from FHenry/3.4
Fix [ bug #895 ] Description is lost when adding a new predefined
2013-05-25 08:11:48 -07: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
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
Laurent Destailleur
4c54bfe3a9 Merge pull request #980 from FHenry/3.4
Fix multilangue search product list
2013-05-25 01:52:06 -07:00
Florian Henry
0a041a7705 Fix multilangue search product list 2013-05-24 22:39:28 +02:00
Laurent Destailleur
1a3a749ccb Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:12:17 +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
Laurent Destailleur
a76c2f500e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-23 22:37:25 +02:00
Laurent Destailleur
02facd0a7e Update doc 2013-05-23 22:37:07 +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
44434e2689 Merge pull request #973 from atm-maxime/develop
Reset every month with @99 was not working properly.
2013-05-23 12:50:17 -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
a9fe9cf0b2 Merge pull request #972 from LProemer/develop
Fix: 'rights' instead of 'right'
2013-05-22 07:28:26 -07:00