Commit Graph

56393 Commits

Author SHA1 Message Date
Laurent Destailleur
cad69c9e90 Fix phpcs 2016-09-11 13:38:15 +02:00
Laurent Destailleur
e90909051e Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab
NEW filter on action type on thirdparty event tab
2016-09-11 13:34:08 +02:00
Laurent Destailleur
9252914a09 Fix avoid useless param if not defined 2016-09-11 13:30:14 +02:00
Laurent Destailleur
1ef0409b28 Merge pull request #5693 from atm-florian/dev_projectwork
Add projectid into link create from
2016-09-11 13:26:22 +02:00
Laurent Destailleur
7f6a19f0bf Merge pull request #5706 from philippe-opendsi/develop
FIX #5705 Supplier Order's lines array initalisation
2016-09-11 10:53:09 +02:00
Laurent Destailleur
0ff42b5f8a If search of cron job is empty, we must show empty list 2016-09-10 19:53:32 +02:00
Laurent Destailleur
dd1d3c866c NEW Add a better icon to show when play in cron jobs is disabled. 2016-09-10 19:48:50 +02:00
Laurent Destailleur
25c5f40bf1 Add css on picto status 2016-09-10 19:44:55 +02:00
Laurent Destailleur
49e54d55d5 Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not
usable.
2016-09-10 18:19:54 +02:00
Laurent Destailleur
72600a521d Fix help 2016-09-10 18:15:03 +02:00
Laurent Destailleur
1a96511490 On survey, replace delete image with stanard image in theme. Add warning
when expired.
2016-09-10 18:13:13 +02:00
Laurent Destailleur
ce137e3987 Fix migration when field was added without null flag. 2016-09-10 17:58:13 +02:00
Laurent Destailleur
1b00d55021 NEW New set of icon for status easier to understand. 2016-09-10 17:57:35 +02:00
Laurent Destailleur
79f19f5c66 Fix missing a filter billed=0 into link of billable orders 2016-09-10 17:48:57 +02:00
Laurent Destailleur
926e3fc6f9 Fix date must be with standard format 2016-09-10 17:43:28 +02:00
Laurent Destailleur
399addebfb FIX alignement of intervention status 2016-09-10 17:38:26 +02:00
Laurent Destailleur
530ae91e82 Fix missing information on main supplier proposal card, not on note tab. 2016-09-10 17:35:08 +02:00
Laurent Destailleur
03c312e35c Fix bad name for modules_action.php 2016-09-10 16:09:46 +02:00
Laurent Destailleur
f8dbc1aa9f Theme cleaner 2016-09-10 16:09:01 +02:00
Laurent Destailleur
9153400195 Merge pull request #5710 from fappels/4.0_debug_product_lot
FIX create shipment with lot and extrafield
2016-09-10 14:39:01 +02:00
Laurent Destailleur
f5884999a9 Merge pull request #5716 from hregis/3.9_bug
Fix: increase max-width when use externals modules
2016-09-10 14:33:13 +02:00
Laurent Destailleur
87fb00c293 Merge pull request #5727 from fmarcet/3.9
Fix: Search all  is lost on lists when pagination or when the columns…
2016-09-10 14:25:16 +02:00
Laurent Destailleur
3ecc82b770 Fix error message not reported 2016-09-10 13:00:31 +02:00
Laurent Destailleur
e10c89fba8 More log to help debug 2016-09-10 12:30:01 +02:00
Laurent Destailleur
8d3adfd1c9 Fix 2016-09-10 12:22:23 +02:00
Laurent Destailleur
4955e8d3de Fix doxygen 2016-09-10 05:34:00 +02:00
Laurent Destailleur
41545e0d60 Fix compatibility of recurring invoices with postgresql 2016-09-10 05:26:31 +02:00
Laurent Destailleur
7c9996c840 Fix when creating recurring invoice, date next gen was not set 2016-09-10 05:25:07 +02:00
Laurent Destailleur
d821df070b Fix multicompany: recurring invoice must be in same env than template. 2016-09-10 04:33:23 +02:00
Laurent Destailleur
c28a62e051 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-10 02:59:10 +02:00
Laurent Destailleur
66cf9e333e Fix option MAIN_BUTTON_HIDE_UNAUTHORIZED 2016-09-10 02:58:46 +02:00
Laurent Destailleur
d7fce0cd24 NEW REST api: Add apis for expense reports 2016-09-09 20:17:34 +02:00
Laurent Destailleur
aeffffe523 NEW REST api order: Parameter to filter thirdparty can be a list of ids 2016-09-09 20:09:12 +02:00
Laurent Destailleur
748656856e Fix doxygen 2016-09-09 18:56:13 +02:00
Laurent Destailleur
5dd8de0f82 Fix syntax error 2016-09-09 18:55:33 +02:00
Laurent Destailleur
0079a3a9c5 A better explanation on choice on thirdparty creation process 2016-09-09 18:41:42 +02:00
Laurent Destailleur
4d9abbd710 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 18:35:26 +02:00
Laurent Destailleur
d4d0e3b406 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-09 18:25:11 +02:00
Laurent Destailleur
5c5a6ce8b3 Fix bad merge 2016-09-09 18:24:51 +02:00
Juanjo Menent
6e39d83480 Merge remote-tracking branch 'upstream/3.9' into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:51:41 +02:00
Juanjo Menent
d8f50f9acd Merge remote-tracking branch 'upstream/3.9' into 4.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:34:02 +02:00
Laurent Destailleur
616594355b NEW Can select fields on expense report list. Can make mass delete. 2016-09-09 15:36:33 +02:00
Ferran Marcet
4777faf49b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 14:02:27 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
858291c3a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Laurent Destailleur
efde12b489 Fix minor css 2016-09-09 09:21:27 +02:00
Juanjo Menent
e3c2299c67 Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
	htdocs/admin/dict.php
	htdocs/fourn/class/fournisseur.commande.class.php
2016-09-08 18:52:44 +02:00
Laurent Destailleur
87165cd859 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-08 18:21:10 +02:00
Juanjo Menent
2625d40038 Merge pull request #5723 from defrance/patch-26
use getnomUrl of society instead 'handmade' url;
2016-09-08 18:20:23 +02:00