Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
Marcos García
7b478dbb35 Contracts box name wasn't being translated 2012-07-19 23:44:28 +02:00
Marcos García
6039c6f420 Added missing translation and fixed some typos 2012-07-19 23:44:02 +02:00
Marcos García
8233a26422 Fixed some spanish & catalan translations 2012-07-19 23:43:41 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges 
Margin module
 2012-07-19 10:46:24 -07:00
Marcos García
44a6236b7d Replaced "Seconds" for "seconds" 
Conflicts:
	htdocs/admin/proxy.php
 2012-07-19 19:43:15 +02:00
Raphaël Doursenaud
4f0d43bbc8 French wording 
Réception -> Traitement en cours
 2012-07-19 19:33:05 +02:00
Raphaël Doursenaud
bba9aa4bb4 French spelling 
Chiffre d'affaire -> Chiffre d'affaires
 2012-07-19 19:32:57 +02:00
Raphaël Doursenaud
04a975fbad Text: Chiffrer 2012-07-19 19:32:43 +02:00
Marcos García
319cf18b3b The tab Documents of the Contracts module wasn't being translated 2012-07-19 19:29:43 +02:00
simnandez
7f33e41113 Trad: Better translation 2012-07-19 19:29:30 +02:00
Laurent Destailleur
fb9bf3ddac Fix: Restore menu entry [ bug #455 ] Impossible de crer une facture fournisseur 2012-07-19 18:23:10 +02:00
Laurent Destailleur
69ca9cf7d4 [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:03:25 +02:00
Christophe Battarel
98a2cf547e correct module description and image 2012-07-19 16:27:08 +02:00
Christophe Battarel
8e8fd72459 correct margin infos display on order 2012-07-19 16:25:40 +02:00
Christophe Battarel
34132de71d add charges to supplier prices 2012-07-19 15:36:25 +02:00
Laurent Destailleur
f5b58b6f12 Fix: Missing fields into insert from webservice 2012-07-19 14:26:02 +02:00
Christophe Battarel
55d547348a margin management for invoices 2012-07-19 11:07:50 +02:00
Christophe Battarel
c8e211c864 add missing include 2012-07-19 10:48:01 +02:00
Christophe Battarel
d32091120b margin management for orders 2012-07-19 10:26:26 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
019b857784 correct display of margin resume table 2012-07-19 09:55:43 +02:00
simnandez
5b3c50dad2 Trad: Add missing translation 2012-07-19 09:13:39 +02:00
Marcos García
98dfa8cd2e Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 09:12:41 +02:00
Laurent Destailleur
1d89c172d0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-07-18 22:41:06 +02:00
Christophe Battarel
9a7935075c correct margin informations when buy_price at zero 2012-07-18 17:29:32 +02:00
Christophe Battarel
8e2fee02df correct default definition for buy_price_ht in migration script 2012-07-18 17:17:00 +02:00
Christophe Battarel
f0f52270a5 adapt to new structure 2012-07-18 17:13:29 +02:00
Christophe Battarel
efba33eb13 adapt to new module structure 2012-07-18 17:00:56 +02:00
Christophe Battarel
411bb993b5 correct path to price.lib.php 2012-07-18 16:49:45 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
34022de1de correction of syntax error in tpl 2012-07-18 16:43:02 +02:00
Christophe Battarel
c5fe895dce adaptation to new module structure 2012-07-18 16:17:33 +02:00
Christophe Battarel
c12c8bd0bb update margin modules to core module 2012-07-18 16:13:29 +02:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +02:00
Christophe Battarel
50c2a65b6a add margin infos to templates 2012-07-18 16:01:54 +02:00
Christophe Battarel
1de9dc15bf add margin module 2012-07-18 15:52:15 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
316f6ce09c add margin infos to commonobject.class.php 2012-07-18 15:26:33 +02:00
Christophe Battarel
58262034cf add extra parameters to control combo in form_thirdparty like in select_company 2012-07-18 15:22:45 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Christophe Battarel
a37707f96f updata database for margin module 2012-07-18 11:39:41 +02:00
Laurent Destailleur
ba25905926 New: [ task #454 ] Add "No category" into filters on category 
combo for product list
 2012-07-18 00:20:33 +02:00
Laurent Destailleur
9116db986f Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes. 2012-07-17 19:45:22 +02:00
Laurent Destailleur
7d9a4f2441 Make code simpler 2012-07-17 19:24:50 +02:00
Laurent Destailleur
73b17dc4c5 New: Make things more clear. 2012-07-17 15:28:34 +02:00
Laurent Destailleur
0021f7d98e New: Use a better format for workflow array: 
- allow more complex permissions/conditions
- allow to define order of options
- can define workflow option not using two modules (can use only one, of
threee or more...)
 2012-07-17 15:27:36 +02:00
Laurent Destailleur
86c59a2460 Better translation 2012-07-17 15:03:04 +02:00
Laurent Destailleur
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +02:00
Laurent Destailleur
393f407341 Update turkish language files 2012-07-17 02:33:14 +02:00