Commit Graph

49359 Commits

Author SHA1 Message Date
Laurent Destailleur
9d7a77f2e5 Doc comment 2015-09-18 12:03:35 +02:00
Laurent Destailleur
f01b9c09a3 Removed duplicate code. Use inheritance instead. 2015-09-18 10:36:23 +02:00
Laurent Destailleur
4195eb3366 NEW Color category is visible onto the thumb of tags on thirdparty, or
products cards.
2015-09-17 20:20:03 +02:00
Laurent Destailleur
c8e0839296 NEW Add color on categories 2015-09-17 20:00:54 +02:00
Laurent Destailleur
27b1f2ecc6 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-17 19:52:13 +02:00
Laurent Destailleur
81b447dd0f NEW Add color on categories 2015-09-17 19:51:56 +02:00
Laurent Destailleur
57521f628c Fix bad path 2015-09-17 19:35:03 +02:00
Laurent Destailleur
b1168d223a NEW Introduce table llx_overwrite_trans to be able to overwrite
translations by simple database edition.
2015-09-17 18:44:42 +02:00
Laurent Destailleur
8ff41a8ded Enhance performance of option MAIN_OVERWRITE_TRANS_ 2015-09-17 15:35:51 +02:00
Laurent Destailleur
8bb832d06b Fix Natural english 2015-09-17 00:48:10 +02:00
Laurent Destailleur
099e3f0376 FIX Removed warnings 2015-09-17 00:47:56 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
313d9ddacd FIX #3534 2015-09-16 22:04:03 +02:00
Laurent Destailleur
7d8013b371 FIX #3533 2015-09-16 21:34:01 +02:00
Laurent Destailleur
38bae655ea Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
Conflicts:
	htdocs/core/class/html.form.class.php
2015-09-16 21:24:51 +02:00
Laurent Destailleur
e36928fd65 FIX #3529 2015-09-16 21:23:52 +02:00
Laurent Destailleur
7f60abdf7b FIX #3524 2015-09-16 21:05:02 +02:00
Laurent Destailleur
813667e564 Debug swith of ckeditor theme 2015-09-15 17:45:40 +02:00
Laurent Destailleur
1b836dc31e Merge pull request #3408 from aspangaro/develop-60
New: CkEditor add possibility to choose skin
2015-09-15 17:09:11 +02:00
Juanjo Menent
7b8096d367 Merge pull request #3523 from defrance/patch-78
fix error on tabcollectors and enhance
2015-09-15 15:16:14 +02:00
Juanjo Menent
91bac76511 Merge pull request #3522 from aspangaro/3.8-18
Fix :  Class 'Categorie' not found in core\class\html.form.class.php in supplier card
2015-09-15 15:11:26 +02:00
aspangaro
5b57231c52 Fix : error skin name by default 2015-09-15 06:14:33 +02:00
BENKE Charlie
95cfce925f fix error on tabcollectors and enhance
fix error on tabcollectors feature
add number of tabs present in tab collectors
2015-09-15 03:33:27 +02:00
aspangaro
2d2f59fe3f Fix : Class 'Categorie' not found in core\class\html.form.class.php 2015-09-14 22:33:48 +02:00
Laurent Destailleur
d985c77eca Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-14 18:36:08 +02:00
Laurent Destailleur
e0a88fabd9 FIX #3521 2015-09-14 17:54:53 +02:00
Laurent Destailleur
36beb289f3 Merge pull request #3520 from aspangaro/3.8-18
Fix #3225 Missing translations in interventions
2015-09-14 17:24:42 +02:00
Laurent Destailleur
ca2b66ffb3 Merge pull request #3519 from aspangaro/3.8-17
Fix #3227 #3226 Missing translations in supplier exports
2015-09-14 17:24:22 +02:00
Laurent Destailleur
c75f62ddb7 FIX icon into export profile may be not correctly output 2015-09-14 12:12:14 +02:00
Laurent Destailleur
b4c964760d Sync transifex 2015-09-13 23:25:55 +02:00
Laurent Destailleur
3b01b8cb47 Fix security hole 2015-09-13 22:50:08 +02:00
aspangaro
334766d194 Fix #3225 Missing translations in interventions 2015-09-13 22:03:54 +02:00
aspangaro
27a85c074e Merge remote-tracking branch 'origin/3.8-18' into 3.8-17 2015-09-13 21:45:32 +02:00
aspangaro
1d4c747aa2 Fix #3227 #3226 Missing translations in supplier exports 2015-09-13 21:44:59 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
7c030a114d Release 3.8.0 2015-09-13 19:26:20 +02:00
Laurent Destailleur
6d32efc4de Merge pull request #3518 from aspangaro/3.8-18
Fix: ER payments are on the bank credit
2015-09-13 19:12:53 +02:00
Laurent Destailleur
0ef297582b Merge pull request #3511 from marcosgdf/bug-3423
FIX #3423 Not possible update values of extrafields in Facture
2015-09-13 19:07:15 +02:00
aspangaro
a805cb9374 Fix: ER payments are on the bank credit 2015-09-13 16:33:02 +02:00
Juanjo Menent
339b558b6b Merge remote-tracking branch 'origin/3.8' into develop 2015-09-13 00:31:21 +02:00
Juanjo Menent
ba3d8f445c Fix #3514 More elegant 2015-09-13 00:25:32 +02:00
Juanjo Menent
744e5375d2 Fix #3514 Bug: Error when trying to add a product to a non-existing object 2015-09-13 00:09:32 +02:00
Juanjo Menent
3db03ed558 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 23:45:16 +02:00
Juanjo Menent
1deb77896f Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order 2015-09-12 23:42:48 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00
Laurent Destailleur
9aec4d554b Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab 2015-09-12 18:21:37 +02:00
Laurent Destailleur
db3c544e21 Fix #3240 [Supplier orders] Dashboard links to unuseful page 2015-09-12 18:14:08 +02:00
Laurent Destailleur
aa1661d64c Fix #3413 Translation of ExpireDate 2015-09-12 18:09:47 +02:00
Laurent Destailleur
67b7345e83 Fix the feature to log a cheque as returned.
Fix duplicate parameter mainmenu and leftmenu into url
2015-09-12 18:00:19 +02:00
Marcos García de La Fuente
637855485e FIX #3423 Not possible update values of extrafields in Facture
Close #3423
2015-09-12 17:28:32 +02:00