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

49746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
97096536b1 Fix #2526 The filter on type numeric is ok now. Sometimes we used 
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
 2015-09-12 15:20:55 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage 
Conflicts:
	htdocs/ftp/index.php
 2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1 Fix duplicate translation/encoding on setEventMessage 2015-09-12 12:52:07 +02:00
Laurent Destailleur
1966d75ced FIX #3490 2015-09-12 12:50:55 +02:00
Laurent Destailleur
db1d9d6d8e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-09-12 11:50:46 +02:00
Laurent Destailleur
0c3ebe63c2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/liste.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-12 11:44:07 +02:00
Laurent Destailleur
86b1a9cbce Merge remote-tracking branch 'origin/3.5' into 3.6 2015-09-12 11:38:25 +02:00
Laurent Destailleur
36632593c0 Fix SQL injections #3300 2015-09-12 11:36:19 +02:00
Laurent Destailleur
75eae394f1 Fix confirmation of scripts make scripts not working with cron 2015-09-12 11:36:06 +02:00
Laurent Destailleur
0bfccc7255 Fix print into form to attach file must be into return. 2015-09-12 11:35:56 +02:00
Laurent Destailleur
309e1604e1 Fix migration missing for leave request module 
Fix permission label for expense report and leave request
 2015-09-12 11:35:49 +02:00
Laurent Destailleur
24a216b154 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-12 11:33:49 +02:00
Laurent Destailleur
06d19a5a40 Work on a new widget 2015-09-12 11:33:22 +02:00
Laurent Destailleur
5bc74ad6ea Fix SQL injections #3300 2015-09-12 11:23:44 +02:00
Laurent Destailleur
a3032d5674 Merge pull request #3504 from fappels/3.5-patch-Dispatch-rounding 
Fix #3471 3.5 Rounding issue when dispatching non-integer
 2015-09-12 11:07:55 +02:00
Laurent Destailleur
a83b3ae7e8 Merge pull request #3503 from fappels/3.7-dispatch-rounding 
Fix #3471 3.7 Rounding issue when dispatching non-integer
 2015-09-12 11:07:16 +02:00
Laurent Destailleur
5e81eb7586 Merge pull request #3505 from GPCsolutions/firephp 
Setup FirePHP like ChromePHP
 2015-09-12 11:02:31 +02:00
Laurent Destailleur
ff1b18ff46 Merge pull request #3501 from FHenry/develop 
NEW : Import link between thirdparties and sales representatives
 2015-09-12 11:01:04 +02:00
Laurent Destailleur
e1a92c8288 Merge pull request #3506 from atm-maxime/3.6 
Fix multientity stock management (F.Henry followup)
 2015-09-12 10:58:26 +02:00
Maxime Kohlhaas
c6081f0fa2 Fix multientity stock management (F.Henry followup) 2015-09-11 20:38:32 +02:00
Laurent Destailleur
6318b12aeb Fix confirmation of scripts make scripts not working with cron 2015-09-11 20:36:45 +02:00