Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

5479 Commits

Author SHA1 Message Date
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Laurent Destailleur
fb923c0c2b Merge pull request #2867 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-21 21:33:42 +02:00
Laurent Destailleur
a09563435b Merge pull request #2840 from FHenry/develop 
NEW : add date value filter on account records list
 2015-05-21 21:22:31 +02:00
aspangaro
e23459d53b NEW Forms are using the tab look, even in creation mode 2015-05-20 21:50:38 +02:00
Florian HENRY
0331ddc2de fix spacing 2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f fix spell 2015-05-20 11:29:35 +02:00
Florian HENRY
8fa3b8dac3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-20 11:24:49 +02:00
Florian HENRY
6e6b66e416 apply recommandation from 
ca53d3b602 (commitcomment-11245627)
 2015-05-20 11:24:23 +02:00
aspangaro
58e942681d NEW Forms are using the tab look, even in creation mode 2015-05-20 07:03:17 +02:00
Florian HENRY
ee1aa3268c working account 2015-05-19 11:55:45 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Florian HENRY
a6c5a247cd add total and title in page records banck account 2015-05-18 11:08:27 +02:00
Florian HENRY
ca53d3b602 NEW : add date value filter on account records list 2015-05-18 10:43:54 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +02:00
Laurent Destailleur
1b03e348d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/annuel.php
 2015-05-16 02:53:36 +02:00
Laurent Destailleur
e382999b9e Css fix 2015-05-15 20:10:17 +02:00
Laurent Destailleur
976211b70f Look enhancement 2015-05-15 12:53:14 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
Laurent Destailleur
4408648a68 Merge pull request #2817 from GPCsolutions/jqueryfixes 
jQuery fixes
 2015-05-12 22:36:12 +02:00
Laurent Destailleur
b3c9c3d91b Merge pull request #2818 from GPCsolutions/htmlfixes 
HTML fixes
 2015-05-12 22:34:35 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest 
Add new core module : REST API
 2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
932e23ac09 [Qual] Use jQuery 'is' instead of 'prop' in conditions 2015-05-12 16:21:21 +02:00
Raphaël Doursenaud
aee61aa2c4 [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Juanjo Menent
97ad7ca88b Code fixes 2015-05-09 14:23:26 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
971e23e006 Fix special_code was lost when updating line 2015-05-07 12:10:27 +02:00
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00
jfefe
dbb9449ee7 Fix PHPCS 2015-05-06 00:55:42 +02:00
jfefe
5f62d2b13e Add API class for invoice 2015-05-05 12:42:57 +02:00
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we 
take first entry found.
 2015-05-03 20:07:16 +02:00
Laurent Destailleur
4e04f75c66 Fix css 2015-04-27 02:33:44 +02:00
aspangaro
3ae8428a12 New: Add search field for value date in vat payment list 2015-04-23 07:26:09 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
aspangaro
b35c929cad Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp 2015-04-22 07:18:52 +02:00
aspangaro
560150fd1c Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default) 2015-04-22 07:15:17 +02:00
Juanjo Menent
b9b21bce8a Merge pull request #2679 from marcosgdf/bug-1786-2 
FIX [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
 2015-04-21 18:52:56 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Laurent Destailleur
e476b57795 Merge pull request #2678 from defrance69/patch-60 
add tab management on salarie payement
 2015-04-21 11:15:20 +02:00
Laurent Destailleur
9d1c609c4f Merge pull request #2538 from marcosgdf/units 
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-04-21 11:14:50 +02:00
Laurent Destailleur
94589b9935 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00