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

3166 Commits

Author SHA1 Message Date
Laurent Destailleur
1e237defb0 Fix phpcs 2015-04-26 17:59:02 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
7c706ebaf6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-25 23:15:55 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is 
black on white (better contrast).
Fix editfieldval for date.
 2015-04-25 22:20:10 +02:00
Laurent Destailleur
5a509940f3 Merge pull request #2706 from GPCsolutions/mobiledetect 
Mobiledetect
 2015-04-24 21:22:56 +02:00
Laurent Destailleur
a091158cce Merge pull request #2690 from open-minds/develop 
Add sorting for extra fields values
 2015-04-24 21:10:27 +02:00
Raphaël Doursenaud
7281ea21e6 Qual: moved mobiledetect external library 
External libraries resides in the include directory
 2015-04-23 20:30:33 +02:00
Laurent Destailleur
7fd2247297 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-23 13:45:02 +02:00
Laurent Destailleur
f9285d6d23 NEW Can add all user of a project as user of a task, in one step. 2015-04-23 13:44:45 +02:00
Juanjo Menent
f7ab53be8e Fix test for es. Dumps 3.5 et 3.6 2015-04-22 23:40:43 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +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
Laurent Léonard
e0cc007487 Add sorting for extra fields values 2015-04-21 20:21:24 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Laurent Destailleur
1c8e1638c7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-21 12:08:56 +02:00
Laurent Destailleur
a690276060 Fix js warnings, select2 css was not loaded. 2015-04-21 12:08:36 +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
jfefe
f2d05ce754 Add missing value for object line type (product or service) 2015-04-20 16:20:04 +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
Marcos García de La Fuente
2967bc7df7 Merge branch 'develop' into units 2015-04-19 17:19:59 +02:00
Raphaël Doursenaud
e7a21de11d Use minified select2 js lib 2015-04-19 12:58:47 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
e1403b136c Merge pull request #2639 from aternatik/stable_resource 
New : mark resource module as stable
 2015-04-18 18:48:24 +02:00
Maxime Kohlhaas
51522decf3 Fix : price in editkeyval function was forcing a price rounding 2015-04-18 18:33:46 +02:00
Laurent Destailleur
08dfcf3afc Merge 2015-04-18 18:14:55 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
Laurent Destailleur
ca05c9a26f Fix PHPCS 2015-04-18 18:07:36 +02:00
Florian HENRY
b7191a541c All send email card works with model choice box 2015-04-18 17:15:36 +02:00
Florian HENRY
cc887ceff3 fix typo 2015-04-18 16:45:45 +02:00
Florian HENRY
d3592c8d58 typo 2015-04-18 13:09:35 +02:00
Florian HENRY
6391fd0c40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Laurent Destailleur
deb62f1ffd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/expedition/list.php
 2015-04-18 04:18:59 +02:00
Laurent Destailleur
aab9b0ec60 Merge pull request #2620 from atm-maxime/develop_cat_multiselect 
New : categories as multi-select on product
 2015-04-18 03:53:05 +02:00
Maxime Kohlhaas
9d8036e5a7 New : categories as multi-select on product 2015-04-18 03:12:42 +02:00
Laurent Destailleur
8511f1f7ef Fix the data-role parameter 2015-04-15 18:14:26 +02:00
Maxime Kohlhaas
4d119065a8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-04-14 13:01:41 +02:00
Laurent Destailleur
75b3fd442e Add option to allow to filter list on project creation 2015-04-14 12:32:19 +02:00
Laurent Destailleur
97cdc55839 NEW Module notification should details of emails into confirm box, not 
only number.
 2015-04-13 17:04:18 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
f6c2472d92 fix var not declared 2015-04-08 21:50:17 +02:00
Laurent Destailleur
c4daca2bac Fix #1682 2015-04-08 21:34:04 +02:00
Laurent Destailleur
ca7a7a9038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php
 2015-04-08 20:43:51 +02:00