2
0
forked from Wavyzz/dolibarr
Commit Graph

15786 Commits

Author SHA1 Message Date
jfefe
7cedf55c27 FIX : missing english name for object
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
2018-04-27 20:54:48 +02:00
Laurent Destailleur
257dc1cf77 Work on rewriting VAT reports 2018-04-27 19:17:34 +02:00
Laurent Destailleur
f1b9188e9b Merge pull request #8563 from ATM-Marc/NEW_backurlforcard
NEW: default add action: new param $backurlforcard to redirect to card
2018-04-27 11:57:15 +02:00
Laurent Destailleur
e88c67ab11 Update actions_addupdatedelete.inc.php 2018-04-27 11:52:10 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
8f60bd35a5 Merge pull request #8676 from atm-florian/7.0
fix commonobject double style
2018-04-27 10:14:13 +02:00
Laurent Destailleur
19d15c79dd Merge pull request #8673 from frederic34/variantonservice
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
3faeb08b78 Merge pull request #8672 from ATM-Nicolas/fix_action_contact
FIX : Related contact printed in societe agenda
2018-04-27 10:00:18 +02:00
Laurent Destailleur
1d40d34123 Merge pull request #8669 from tomours/develop
Fix french bank holidays (Easter related)
2018-04-27 09:56:01 +02:00
Laurent Destailleur
42722da824 Update date.lib.php 2018-04-27 09:55:44 +02:00
Laurent Destailleur
dde86628e7 Update date.lib.php 2018-04-27 09:49:52 +02:00
Laurent Destailleur
e1cfe0e2dd Update date.lib.php 2018-04-27 09:49:15 +02:00
Laurent Destailleur
659fd46b76 Merge pull request #8653 from ATM-Marc/NEW_commonObject_array
NEW: work on CommonObject 'array' field typeNew common object array
2018-04-27 09:39:26 +02:00
Laurent Destailleur
59e5545aa7 Fix phpunit 2018-04-27 09:18:25 +02:00
Laurent Destailleur
69db960a92 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/activity/perweek.php
2018-04-26 18:33:02 +02:00
Laurent Destailleur
d988585f86 Save spaces in timesheet report page 2018-04-26 11:07:20 +02:00
Laurent Destailleur
36616cdd50 FIX When time is entered without hour, edit keeps this 2018-04-26 10:07:27 +02:00
Laurent Destailleur
21a18da43b We can disable the "favorites" in select combo of countries 2018-04-25 21:06:51 +02:00
Laurent Destailleur
6b2bd93469 NEW Add dol_is_link function 2018-04-25 17:59:05 +02:00
Laurent Destailleur
39aef07c6b FIX Only voters can send comments in public survey page 2018-04-25 17:14:18 +02:00
Marc de Lima Lucio
c044d9ab58 FIX: actioncomm export: type filtering not working 2018-04-25 16:20:09 +02:00
Laurent Destailleur
83b762b681 FIX CVE-2018-9019 2018-04-25 16:01:06 +02:00
Laurent Destailleur
75a4891113 Add az09comma to sanitize sortfield/sortorder 2018-04-25 15:47:42 +02:00
Laurent Destailleur
ae412f228d NEW Experimental DAV module provides a public and private directory 2018-04-25 12:22:02 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
2018-04-24 12:57:31 +02:00
florian HENRY
67329b8805 fix commonobject double style 2018-04-24 12:33:07 +02:00
Frédéric FRANCE
5f4e2dc565 variant on services 2018-04-24 11:01:17 +02:00
ATM-Nicolas
736c56705b FIX : Related contact printed in societe agenda 2018-04-24 10:02:26 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2018-04-23 23:09:53 +02:00
Laurent Destailleur
fdb3a11f34 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937 FIX extrafields price and double were lost during a failed post. 2018-04-23 22:53:57 +02:00
Thomas OURSEL
4fd0ab3f31 Merge remote-tracking branch 'upstream/develop' into develop 2018-04-23 15:57:09 +02:00
Thomas OURSEL
f402753fa3 Fix french holidays (Easter related) 2018-04-23 15:14:34 +02:00
Laurent Destailleur
743f3d60f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-22 20:59:42 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
6aa2ca7462 Merge pull request #8659 from aspangaro/8.0-a24
Fix Accountancy
2018-04-22 20:30:42 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
ac89951acd Merge pull request #8647 from fmarcet/develop
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
68a0b45141 Merge pull request #8648 from grandoc/new_branch_20_04_2018
clean and update code
2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
f83369d268 Remove travis warnings 2018-04-22 11:27:26 +02:00
Laurent Destailleur
769a1f507b Debug asset module 2018-04-22 11:26:59 +02:00
Alexandre SPANGARO
d8e7c98a8d Add nature "inventory" & hide in ventilation journal 2018-04-22 05:56:31 +02:00
Laurent Destailleur
9eeaf5c3eb dol_syslog now strftime instead of dol_print_date 2018-04-21 12:22:21 +02:00
Philippe GRAND
410d1ee07d Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 12:05:50 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Philippe GRAND
4e9c77a738 Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018 2018-04-21 11:46:03 +02:00