Commit Graph

27851 Commits

Author SHA1 Message Date
Laurent Destailleur
276e32dc22 Fix: Products with no prices not visible 2012-07-25 11:27:25 +02:00
Laurent Destailleur
b47ced7507 Fix: syntax error 2012-07-25 10:56:30 +02:00
Laurent Destailleur
b63505ff15 Better fix 2012-07-23 11:10:18 +02:00
Regis Houssin
01ab1aa66f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
2012-07-23 11:07:53 +02:00
Regis Houssin
3fe8b5bc58 Change-Id: Ia9f609c8a1264d245ff5074b981305f7d1792aef 2012-07-23 11:01:52 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
7a8224c4d5 Normalize code 2012-07-23 10:55:29 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Laurent Destailleur
f07c416f76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-23 10:38:02 +02:00
Regis Houssin
0301e35a44 Merge pull request #256 from marcosgdf/task-195
Completed Task #195
2012-07-23 01:37:37 -07:00
Regis Houssin
6e41d645f0 Merge pull request #251 from cbattarel/commissions
basic commissions management module
2012-07-23 01:37:09 -07:00
Laurent Destailleur
087cf87722 New: Add state into substitution vars 2012-07-23 10:29:58 +02:00
Regis Houssin
a109d5f32b Fix: bug #467 2012-07-23 10:29:26 +02:00
Laurent Destailleur
1c17767dda Fix: Send instructions must be into core page. 2012-07-22 23:22:40 +02:00
Laurent Destailleur
0eb9b105c9 Fix: Translation missing 2012-07-22 23:07:25 +02:00
Laurent Destailleur
68e619fb00 Fix: escape for create command 2012-07-22 21:50:08 +02:00
Marcos García
568db22649 Renamed fk_methode_commande to fk_input_method 2012-07-22 16:58:37 +02:00
Laurent Destailleur
8080ee4565 Fix: dol_syslog at wrong place. 2012-07-22 16:57:15 +02:00
Laurent Destailleur
970d946e5b Fix: sql injection for create database 2012-07-22 16:53:32 +02:00
Marcos García
e6a192ba87 Renamed fk_demand_reason to fk_input_reason 2012-07-22 16:53:02 +02:00
Marcos García
9eb9fe6d2c Moved bookmark translations from other.lang to bookmarks.lang, also
removed unused translations

Conflicts:
	htdocs/langs/tr_TR/bookmarks.lang
2012-07-22 16:44:16 +02:00
Laurent Destailleur
474a67a4a4 Fix: picto 2012-07-22 16:11:23 +02:00
Laurent Destailleur
0d6baa4288 Qual: Enhance codesniffer setup 2012-07-22 14:08:05 +02:00
Laurent Destailleur
c41c5bf797 New: Add help on feature to use it with caution 2012-07-22 13:36:28 +02:00
Laurent Destailleur
72d9f7348c Fix: Missing lang loading 2012-07-22 12:13:53 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Laurent Destailleur
db4c6bd289 New: After first install, warning are visible onto mandatory setup
not configured. Show also total number of activated modules.
2012-07-22 01:03:19 +02:00
Christophe Battarel
b8fa4468ce add commissions module 2012-07-20 16:21:35 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Marcos García
9f3f3703e3 Fixed Catalan typos too 2012-07-19 23:44:36 +02:00
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