lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,999 Commits 43 Branches 150 Tags 886 MiB
1eae596f98
Commit Graph

27508 Commits

Author SHA1 Message Date
Laurent Destailleur
1eae596f98 Prepare 3.2.1 2012-07-22 14:33:22 +02:00
Laurent Destailleur
2a9456cb83 Fix: Brazilian translation 2012-07-22 14:23:13 +02:00
Laurent Destailleur
f1f9c842f8 Fix: The missing feature to close proposal on order close was fixed 
differently.
 2012-07-22 13:13:38 +02:00
Regis Houssin
34f790b85e Merge pull request #250 from marcosgdf/fix-some-translations 
Fix some typos on translations
 2012-07-19 14:36:24 -07:00
Marcos García
af9c8abe9c Fixed Catalan typos too 2012-07-19 20:06:08 +02:00
Marcos García
50129ec945 Contracts box name wasn't being translated 2012-07-19 19:40:56 +02:00
Raphaël Doursenaud
2160e86928 French wording 
Réception -> Traitement en cours
 2012-07-19 19:34:15 +02:00
Raphaël Doursenaud
0b2e07964f French spelling 
Chiffre d'affaire -> Chiffre d'affaires
 2012-07-19 19:34:06 +02:00
Regis Houssin
5386f00b0e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-07-19 19:33:55 +02:00
Raphaël Doursenaud
78b0f14b1a Text: Chiffrer 2012-07-19 19:33:37 +02:00
Regis Houssin
467bf090dd Merge pull request #246 from simnandez/3.2 
Trad: Better translation
 2012-07-19 10:25:31 -07:00
Regis Houssin
4fcbe39fd9 Merge pull request #248 from marcosgdf/fix-contract-translation 
The tab Documents of the Contracts module wasn't being translated
 2012-07-19 10:25:02 -07:00
Regis Houssin
7ad2de61d1 Merge pull request #249 from marcosgdf/fix-security-seconds-translation 
Replaced "Seconds" for "seconds"
 2012-07-19 10:24:15 -07:00
Marcos García
d5c95b76a5 Added missing translation and fixed some typos 2012-07-19 19:06:23 +02:00
Marcos García
e7d117c920 Fixed some spanish & catalan translations 2012-07-19 18:41:36 +02:00
Marcos García
9b21aa0a60 Replaced "Seconds" for "seconds" 2012-07-19 18:05:09 +02:00
Laurent Destailleur
f5a4f32b0f [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:04:56 +02:00
Laurent Destailleur
674aa0cf12 Fix: Duplicate begin 2012-07-19 17:28:13 +02:00
Marcos García
d1646e245a The tab Documents of the Contracts module wasn't being translated 2012-07-19 17:18:41 +02:00
Laurent Destailleur
03f85bef83 [ bug #444 ] Regression on auto-closing for proposals and orders 2012-07-19 16:57:10 +02:00
Laurent Destailleur
d68a2cb0d8 Fix: Removed warning 2012-07-19 16:27:03 +02:00
simnandez
5a1e29cc08 Trad: Better translation 2012-07-19 12:28:47 +02:00
Regis Houssin
45b24fff0d Merge pull request #244 from simnandez/3.2 
Trad: Add missing translation
 2012-07-18 23:44:12 -07:00
Marcos García
4f2a47c4fc Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 02:26:41 +02:00
Laurent Destailleur
f4f2db33f0 Better translation 
Conflicts:
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
 2012-07-17 15:30:52 +02:00
Laurent Destailleur
b73014c044 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-07-17 01:27:08 +02:00
Laurent Destailleur
53cc1667d5 Fix: error when validating shipment for non predefined products with a 
selected warehouse.
 2012-07-17 01:26:31 +02:00
simnandez
af9b03e7c7 Trad: Add missing translation 2012-07-14 22:25:14 +02:00
Regis Houssin
dd7c3ed2f8 Merge pull request #243 from simnandez/3.2 
Trad: Add missing translations
 2012-07-13 07:28:46 -07:00
Regis Houssin
7e25172f03 Fix: missing entity filter 2012-07-13 16:24:12 +02:00
simnandez
a83c118a8f Trad: Add missing translations 2012-07-13 15:56:55 +02:00
simnandez
8014713795 Fix: Bad local taxes if price base type is TTC 2012-07-13 15:02:02 +02:00
simnandez
10e632375f Fix: Bad local taxes if price base type is TTC 2012-07-13 14:40:51 +02:00
Laurent Destailleur
9327858bee Fix: Bad merge 2012-07-13 12:23:17 +02:00
Laurent Destailleur
b801a391a4 Fix: Phone not saved when using web service 2012-07-13 12:15:16 +02:00
Regis Houssin
20704d6a5c New: classify billed order if invoice billed (workflow 
manager)

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
 2012-07-13 12:14:41 +02:00
Regis Houssin
1af4834f10 Fix: for multicompany transverse mode 2012-07-10 13:43:38 +02:00
Regis Houssin
02f30aeee2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-10 13:40:17 +02:00
Laurent Destailleur
58b2b91928 Fix: removed warning 2012-07-08 16:55:42 +02:00
Regis Houssin
3686fad393 Fix: compatibility with multicompany and transverse mode 2012-07-07 15:25:21 +02:00
Regis Houssin
8b832f475f Fix: getpost error 2012-07-07 12:53:27 +02:00
Regis Houssin
925bded6d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 12:29:04 +02:00
Regis Houssin
dd60c384a5 Fix: missing object 2012-07-07 12:27:45 +02:00
Regis Houssin
293e0ac831 Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2 2012-07-07 12:21:40 +02:00
Regis Houssin
250e3555c3 Fix: more bugs with multicompany 2012-07-07 11:03:16 +02:00
Regis Houssin
8ee06f02b1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 11:02:59 +02:00
Regis Houssin
ba896c024d Fix: problem with template 2012-07-07 11:01:48 +02:00
Regis Houssin
41dcd9370a Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 08:01:48 +02:00
Regis Houssin
928af1a2b3 Fix: security 2012-07-07 08:00:18 +02:00
Regis Houssin
c8eb666826 Fix: compatibility with multicompany 2012-07-06 20:53:18 +02:00