lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71,274 Commits 43 Branches 150 Tags 886 MiB
05d617b759
Commit Graph

62298 Commits

Author SHA1 Message Date
Laurent Destailleur
4f7d3e794a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47 FIX #9992 2018-11-11 17:28:17 +01:00
Laurent Destailleur
65d8f59321
Merge pull request #9992 from delcroip/patch-18 
to support proposal_supplier insert
 2018-11-11 17:27:23 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
Laurent Destailleur
f39b99b153
Merge pull request #9933 from ptibogxiv/patch-83 
Update Stripe Version API
 2018-11-11 17:25:49 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
0b57faa7b4 Fix help 2018-11-11 14:42:11 +01:00
Laurent Destailleur
de259e9db6 Code comment 2018-11-11 14:36:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
ptibogxiv
80782a366e
Fix Invalid argument supplied for foreach() 2018-11-10 15:04:38 +01:00
Laurent Destailleur
6591cdba75 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:03:34 +01:00
ptibogxiv
5c96689c87
Fix Invalid argument supplied for foreach() 2018-11-10 15:02:50 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert 
proposal_supplier has 17 char when the elementtype column can take only 16 char
 2018-11-10 14:59:46 +01:00
Laurent Destailleur
ed3a333436 Fix phpcs 2018-11-10 13:11:18 +01:00
Laurent Destailleur
776d5e6fc6
Merge pull request #9988 from frederic34/patch-15 
The variable $i seems to be never defined.
 2018-11-10 12:20:09 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug 
FIX missing field "visible"
 2018-11-10 12:19:35 +01:00
Laurent Destailleur
2946ca60cf
Merge pull request #9989 from frederic34/patch-16 
Update actions_ticket.class.php
 2018-11-10 12:18:37 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim 
add admin dkim translation
 2018-11-10 12:16:43 +01:00
Laurent Destailleur
bae1ff67a4
Merge pull request #9986 from frederic34/patch-9 
remove warning
 2018-11-10 12:16:10 +01:00
ptibogxiv
20a3dd86cd
2018-11-08 
no change for dolibarr but better for integration and development
 2018-11-10 11:07:01 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php 2018-11-10 07:55:01 +01:00
Frédéric FRANCE
c2ee9ba9db
Update actions_ticket.class.php 2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96
Update actions_ticket.class.php 2018-11-10 07:32:22 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined. 2018-11-10 07:27:20 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Frédéric FRANCE
172468587d
Update mymodulewidget1.php 2018-11-09 18:13:13 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation 2018-11-09 18:08:06 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Frédéric FRANCE
1fd398234f
remove warning 2018-11-09 15:29:49 +01:00
Laurent Destailleur
773e2da4cc Fix example of number for holiday 2018-11-09 11:41:27 +01:00
Regis Houssin
ee06f36f4c FIX missing field "visible" 2018-11-09 11:36:20 +01:00
Regis Houssin
5d1d77a966 FIX missing action "edit" for the hook 2018-11-09 10:32:08 +01:00
Laurent Destailleur
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +01:00
Laurent Destailleur
4946de9533 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/setup/codesniffer/ruleset.xml
 2018-11-09 01:32:47 +01:00
Laurent Destailleur
9d15f83f4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent Destailleur
8a89da25c6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/margin/tabs/thirdpartyMargins.php
 2018-11-08 20:18:13 +01:00
Laurent Destailleur
400b48bd9b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:59 +01:00
Laurent Destailleur
9012f6ecc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:40 +01:00
Laurent Destailleur
1b8649be6f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:14:02 +01:00
Laurent Destailleur
d6bd325f70
Merge pull request #9980 from atm-john/fix_supplier_order_list_socid 
FIX supplier order list keep socid
 2018-11-08 20:13:52 +01:00
Laurent Destailleur
b26867c027
Merge pull request #9977 from ptibogxiv/patch-89 
FIX API for document download
 2018-11-08 20:09:08 +01:00
Laurent Destailleur
4ced94f5fd
Merge pull request #9974 from frederic34/previewimage 
can click on image to preview in doc list
 2018-11-08 20:06:38 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
Laurent Destailleur
f919e6ddb0
Merge pull request #9971 from atm-gauthier/FIX_langs_projet 
FIX : OppStatusShort doesn't exists
 2018-11-08 20:00:49 +01:00
Laurent Destailleur
76ac3bd457 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 19:57:42 +01:00
Laurent Destailleur
be788e6167 FIX responsive 2018-11-08 19:57:31 +01:00
Laurent Destailleur
b45ead7038
Merge pull request #9970 from OPEN-DSI/search-contact-by-town 
New Search Contact by Town
 2018-11-08 19:55:51 +01:00
Laurent Destailleur
50bd8bc4ce
Merge pull request #9969 from grandoc/new_branch_07_11_2018 
fix : missing translation
 2018-11-08 19:55:25 +01:00
Laurent Destailleur
7430a35533
Merge pull request #9966 from madx666/contrib 
Fix public ticket website
 2018-11-08 19:54:36 +01:00
Laurent Destailleur
e84e7f02c8
Merge pull request #9963 from atm-john/fix_marge_sign 
FIX marge sign
 2018-11-08 19:37:52 +01:00
Laurent Destailleur
01baddb096
Merge pull request #9959 from hregis/8.0_bug 
FIX export only prices of the current entity !
 2018-11-08 19:26:09 +01:00
Laurent Destailleur
d1aabf9566
Merge pull request #9976 from atm-john/fix_warning 
FIX Warning: count()
 2018-11-08 19:25:32 +01:00
Laurent Destailleur
b6ffca01d2
Merge pull request #9973 from AXeL-dev/patch-2 
remove useless line of code
 2018-11-08 19:25:00 +01:00
Laurent Destailleur
ed76fef860
Merge pull request #9954 from LaurentBouquet/feature/product-search-barcode 
NEW Add product search from barcode via REST api.
 2018-11-08 19:18:41 +01:00
Laurent Destailleur
5e705ae209
Merge pull request #9950 from grandoc/new_branch_04_11_2018 
Clean and update code
 2018-11-08 19:16:25 +01:00
Laurent Destailleur
78778e4c58
Merge pull request #9948 from frederic34/patch-9 
FIX mode is only customer in stats fichinter
 2018-11-08 19:16:00 +01:00
Laurent Destailleur
a50eb014ee
Merge pull request #9946 from ptibogxiv/patch-88 
Fix with new stripe payment function
 2018-11-08 19:13:38 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent Destailleur
27dcf18637 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 18:43:31 +01:00
ptibogxiv
cf688a894b
Update api_documents.class.php 2018-11-08 17:20:12 +01:00
Laurent Destailleur
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f Merge branch 'develop' into feature/product-search-barcode 2018-11-08 16:57:49 +01:00
Laurent Destailleur
6401a7ab06 Fix css 2018-11-08 16:03:10 +01:00
John BOTELLA
98548337ae FIX supplier order list keep socid 2018-11-08 15:38:25 +01:00
ptibogxiv
8727435216
Update API for download 
more infos for easiest & better use of the generated file by API
 2018-11-08 13:58:37 +01:00
Frédéric FRANCE
8bb1545ed0
Update index.php 2018-11-08 12:16:05 +01:00
Frédéric FRANCE
670eed1e68
Update index.php 2018-11-08 12:13:07 +01:00
John BOTELLA
7c4dad2728 FIX Warning: count() 2018-11-08 12:12:45 +01:00
Laurent Destailleur
224d37cfeb Add bootstrap-iso class 2018-11-08 12:12:08 +01:00
Laurent Destailleur
c55f83b0b7 Fix multicompany filter missing 2018-11-08 11:25:29 +01:00
Laurent Destailleur
22170ac1c1 FIX Crop of large files was selecting wrong image area. 2018-11-08 10:45:39 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796 Fix look and feel v8 2018-11-08 09:51:46 +01:00
Frédéric FRANCE
3ba3a47f20
close window 2018-11-07 22:04:55 +01:00
Frédéric FRANCE
df224e4b54
can click on image to preview in doc list 2018-11-07 21:51:05 +01:00
AXeL-dev
9dbb222a0a remove useless line of code 2018-11-07 18:27:41 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
6ba78b2bb3 Work on email collector 2018-11-07 16:33:06 +01:00
gauthier
70826c3191 FIX : same on lines 2018-11-07 16:32:23 +01:00
gauthier
05a679a10c FIX : OppStatusShort doesn't exists 2018-11-07 16:26:25 +01:00
François J
afdefa56bd New Search Contact by Town 
Adding the missing SQL condition to filter contact list by user requested town
 2018-11-07 15:34:07 +01:00
Philippe GRAND
f6394e4210 fix : error 500 2018-11-07 15:07:57 +01:00
Philippe GRAND
671b4dc227 fix : missing translation 2018-11-07 14:01:49 +01:00
Laurent Destailleur
46db246273 Look and feel v9: Autofocus on create forms 2018-11-07 13:04:43 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
c5231112c5 Fix regression with old canvas 2018-11-07 12:22:12 +01:00
John BOTELLA
9d780a1722 Fix sign 2018-11-07 10:11:29 +01:00
madx666
2ff69bb3fc Fix viewTicketMessages for ticket module 2018-11-07 10:11:28 +01:00
madx666
c76c2e0d3e Fix newMessagePublic for ticket module 2018-11-07 10:08:38 +01:00
John BOTELLA
4f7be36249 fix extrafield hidden 2018-11-07 09:14:29 +01:00
Laurent Destailleur
c1cf4fbb95 Fix phpcs 2018-11-06 20:29:58 +01:00
Laurent Destailleur
7dd941dd51 Fix bad fix 2018-11-06 19:51:16 +01:00
Laurent Destailleur
c4db549f94 Work on emailcollector 2018-11-06 19:49:52 +01:00
Laurent Destailleur
a976dd74db Fix Report error if file size too large 2018-11-06 18:44:51 +01:00
Laurent Destailleur
e0070bd348 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2018-11-06 18:30:57 +01:00
Regis Houssin
d32fd9fda5 FIX export only prices of the current entity ! 2018-11-06 18:08:29 +01:00
Laurent Destailleur
7e33af6677 Fix max size 2018-11-06 17:40:59 +01:00
Laurent Destailleur
1e801c7c8a Fix css 2018-11-06 16:50:31 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900 NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and 
SHIPPING_PDF_HIDE_QTYTOSHIP
 2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Bouquet
cb10da4d41 [Core] Add product search from barcode via REST api 2018-11-05 23:06:19 +01:00
Laurent Bouquet
0f43521274 Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45 2018-11-05 22:52:57 +01:00
Laurent Destailleur
15dd2b3e35 Work on email collector 2018-11-05 21:19:09 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518 Debug modulebuilder 2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08 Debug emailcollector 2018-11-05 16:59:40 +01:00
Laurent Destailleur
eb9defcf1d Debug emailcollector 2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
f0305a7beb Prepare 8.0.4 2018-11-05 13:50:12 +01:00
Laurent Destailleur
9556a6dfb9 Remove warning 2018-11-05 12:31:35 +01:00
Laurent Destailleur
c988e2e681 Fix phpcs 2018-11-05 10:44:37 +01:00
Laurent Destailleur
4c591daab1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2018-11-05 10:39:22 +01:00
Laurent Destailleur
90729c03c4 Fix dependencies of new modules 2018-11-05 10:28:44 +01:00
Laurent Destailleur
56a70ab4e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 10:23:15 +01:00
Laurent Destailleur
693cf72fca
Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access 
FIX: task time screen: bad task assignments
 2018-11-05 10:21:28 +01:00
Laurent Destailleur
01d7b1e96a Fix readme detection 2018-11-05 10:15:22 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 09:56:00 +01:00
Laurent Destailleur
a9bbb82e98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:55:12 +01:00
Laurent Destailleur
bf2c521988 Fix warning 2018-11-05 09:55:00 +01:00
Laurent Destailleur
1afdf7a961
Merge pull request #9947 from bafbes/abb80042 
New : help picto for fields in creation
 2018-11-05 09:54:42 +01:00
Laurent Destailleur
7c3cb7d73c
Update commonfields_add.tpl.php 2018-11-05 09:54:11 +01:00
Laurent Destailleur
ccf6554f76
Merge pull request #9941 from ptibogxiv/patch-87 
Fix various fix cmail, payout, const, connect
 2018-11-05 09:38:41 +01:00
Laurent Destailleur
6fd76f5ffb
Merge pull request #9939 from ptibogxiv/patch-86 
Fix ext_payment_site
 2018-11-05 09:37:45 +01:00
Laurent Destailleur
6b89bc4ecc
Merge pull request #9937 from aspangaro/9.0_FEC 
Debug asset module
 2018-11-05 09:36:42 +01:00
Laurent Destailleur
8b373fb7a3
Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent 
Fix parent link was not removed on societe deletion #9106
 2018-11-05 09:35:41 +01:00
Laurent Destailleur
ce25c6644f
Merge pull request #9952 from andreubisquerra/master 
No posibility to validate if invoice not exist
 2018-11-05 09:27:12 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Laurent Destailleur
4e0dbc1826
Merge pull request #9932 from grandoc/new_branch_01_11_2018 
complete comment
 2018-11-05 09:20:00 +01:00
Laurent Destailleur
58b7201529
Merge pull request #9931 from aspangaro/9.0_accountancy 
Fix Specific finename for FEC export only available on general ledger export
 2018-11-05 09:19:42 +01:00
Laurent Destailleur
234c35e940
Merge pull request #9930 from frederic34/fixphpcs 
fix phpcs
 2018-11-05 09:18:34 +01:00
Laurent Destailleur
d130e79384
Merge pull request #9936 from ptibogxiv/patch-84 
Fix payout
 2018-11-05 09:17:18 +01:00
andreubisquerra
86b98db2a2 No posibility to validate if invoice not exist 2018-11-04 20:36:23 +01:00
Philippe GRAND
eb49558600 Clean and update code 2018-11-04 12:09:16 +01:00
Frédéric FRANCE
488ac8c8f0
Update index.php 2018-11-03 23:44:25 +01:00
Laurent Destailleur
90d3b80efb NEW Add email in event histor for reminder email of expired subsription 2018-11-03 22:53:55 +01:00
Frédéric FRANCE
c01113e28b
typo 2018-11-03 22:49:30 +01:00
Laurent Destailleur
f4346c1469 Fix css 2018-11-03 19:24:28 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
c4bf0f0e03 CSS Flex 2018-11-03 18:57:18 +01:00
Frédéric FRANCE
d6b909a280
Update index.php 2018-11-03 18:26:11 +01:00
Frédéric FRANCE
8ab53012b7
mode is only customer in stats fichinter 2018-11-03 18:20:36 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Laurent Destailleur
7e55701774 2 remind of subscription expired by default 2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2 2 remind of expired subscription by default 2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178 Fix family of module 2018-11-03 11:38:29 +01:00
Laurent Destailleur
28d5f1d50b Fix sql syntax error 2018-11-03 11:30:32 +01:00
Abbes Bahfir
5f4d644cab New : help picto for fields in creation 2018-11-03 11:12:50 +01:00
ptibogxiv
171d36d4fc
Update payment.php 2018-11-02 17:49:11 +01:00
ptibogxiv
ab53885ef8
Fix with new stripe payment function 2018-11-02 17:22:42 +01:00
ptibogxiv
d5a910841f
Fix various fix cmail, payout, const, connect 2018-11-01 23:20:28 +01:00
ptibogxiv
b34f781686
Fix ext_payment_site 2018-11-01 23:04:10 +01:00
Alexandre SPANGARO
8d8023b405 Debug asset module 2018-11-01 22:32:33 +01:00
ptibogxiv
263e8ed4af
Fix payout 2018-11-01 20:45:08 +01:00
Maxime Kohlhaas
29c0448a2e Fix parent link was not removed on societe deletion #9106 2018-11-01 15:41:58 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
1140735554 Fix css 2018-11-01 15:20:05 +01:00
ptibogxiv
a46f29cb98
Update Stripe Version API 
The description field on customer endpoints has a maximum character length limit of 350 now. The name field on product endpoints has a maximum character length limit of 250 now. The description field on invoice line items has a maximum character length limit of 500 now.
The billing_reason attribute of the invoice object now can take the value of subscription_create, indicating that it is the first invoice of a subscription. For older API versions, billing_reason=subscription_create is represented as subscription_update.
 2018-11-01 12:02:36 +01:00
Philippe GRAND
b7f5e9e6c7 complete comment 2018-11-01 11:50:55 +01:00
Alexandre SPANGARO
af1305a0a8 Fix Specific finename for FEC export only available on general ledger export 2018-11-01 07:24:48 +01:00
Frédéric FRANCE
aa8236dd98
fix phpcs 2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
e4cfc2c6cb Fix public 2018-10-31 17:30:08 +01:00
Laurent Destailleur
dfb20c705e NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE 2018-10-31 16:05:50 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2018-10-31 11:50:29 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Laurent Destailleur
ea5b0f53d0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 22:32:54 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Laurent Destailleur
c764d7f8d5 Fix remove var_dump 2018-10-30 21:34:17 +01:00
Laurent Destailleur
a44fbfb2e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 21:30:57 +01:00
Laurent Destailleur
3d16b05fdb Fix fetch 2018-10-30 21:30:44 +01:00
Frédéric FRANCE
46fd3bcaf8
fix display holiday month report if none 2018-10-30 21:15:52 +01:00
Laurent Destailleur
064417dcf1
Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2 
Fix invoice creation from contract was invoicing closed services #9087
 2018-10-30 21:13:38 +01:00
Frédéric FRANCE
395e9ceae2
fix stats display expensereport 2018-10-30 20:36:12 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
f845a52b20 Fix phpcs 2018-10-30 16:37:50 +01:00
Marc de Lima Lucio
2fbc305683 FIX: task time screen: last fix was overkill 2018-10-30 16:00:56 +01:00
Laurent Destailleur
a3e49f021d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 15:32:25 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
b9078c6d58 Fix phpcs 2018-10-30 15:30:04 +01:00
Laurent Destailleur
ecdecfcbce Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 15:28:23 +01:00
Laurent Destailleur
2b526f7469 Fix phpcs 2018-10-30 15:28:11 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias 
FIX missing name alias field in societe import/export #9091
 2018-10-30 15:00:34 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone 
Fix invoice supplier clone was not getting all lines parameters #9800
 2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice 
Fix clone fourn order and invoice lines special code
 2018-10-30 14:55:50 +01:00
Laurent Destailleur
0c77f6c3c5
Merge pull request #9918 from bafbes/abb80041 
Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject
 2018-10-30 14:52:23 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27 
make play and playdisable equals
 2018-10-30 14:49:54 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change 
Fix changing currency in a doc was recalculating amounts in company currency #9801
 2018-10-30 14:48:46 +01:00
Laurent Destailleur
4a71374cf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Laurent Destailleur
a231932972
Merge pull request #9904 from atm-maxime/fix_replenish_qtymin 
FIX replenish wasn't caring about supplier price min quantity #9561
 2018-10-30 14:25:55 +01:00
Laurent Destailleur
0f850cfa3e
Merge pull request #9901 from frederic34/patch-22 
use strict compare
 2018-10-30 14:23:40 +01:00
Laurent Destailleur
76c3bac777
Merge pull request #9900 from frederic34/patch-21 
use strict compare
 2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20 
use strict compare
 2018-10-30 14:23:01 +01:00
Laurent Destailleur
6c9f02e9c6
Merge pull request #9898 from frederic34/patch-18 
use strict compare
 2018-10-30 14:22:19 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug 
FIX $forceentity is not used, replace by $currentobject if needed
 2018-10-30 14:16:29 +01:00
Laurent Destailleur
8ce035fc36
Merge pull request #9894 from librethic-code/patch-1 
FIX: keep external module element when adding resource
 2018-10-30 14:06:38 +01:00
Laurent Destailleur
40cc2157ae
Merge pull request #9902 from frederic34/patch-24 
use strict compare
 2018-10-30 13:58:06 +01:00
Laurent Destailleur
b4c9df65f9 FIX #9907 Can set several modules on ->depends 2018-10-30 13:56:51 +01:00
Laurent Destailleur
d309f22e55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf FIX #9907 2018-10-30 13:54:11 +01:00
Laurent Destailleur
0127682996
Merge pull request #9881 from grandoc/8.0 
merging and typo
 2018-10-30 12:41:56 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email 
FIX the member e-mail on resign and validation.
 2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php 2018-10-30 12:41:06 +01:00
Laurent Destailleur
4d0cc0a03d
Merge pull request #9895 from hregis/develop_bug2 
FIX remove deprecated and unused file
 2018-10-30 12:32:20 +01:00
Laurent Destailleur
06bffeeca5
Merge pull request #9910 from atm-ph/fix_8.0_pgsql 
Fix pgsql : operator does not exist: timestamp without time zone ~~ u…
 2018-10-30 12:31:04 +01:00
Laurent Destailleur
a8e6c3832e
Update list.php 2018-10-30 12:30:56 +01:00
Marc de Lima Lucio
8911d72be8 FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do 2018-10-30 12:28:04 +01:00
Laurent Destailleur
d938711e1e
Merge pull request #9883 from frederic34/patch-9 
fix phpcs
 2018-10-30 12:27:37 +01:00
Laurent Destailleur
bddd658ba6
Merge pull request #9885 from frederic34/patch-15 
code comment html form class
 2018-10-30 12:27:19 +01:00
Laurent Destailleur
4ef0d2ce82
Merge branch 'develop' into 8.0_dict 2018-10-30 12:26:37 +01:00
Laurent Destailleur
7f1776c3a1
Merge pull request #9903 from atm-maxime/fix_loan_accounting 
FIX default accounting accounts on loan creation #9643
 2018-10-30 12:21:25 +01:00
Laurent Destailleur
9e849011e3
Merge pull request #9887 from frederic34/patch-16 
code comment api contract
 2018-10-30 12:20:42 +01:00
Laurent Destailleur
2ced09e8ab
Merge pull request #9888 from aljawaid/patch-3 
FIX: Expense Report Ref Not Showing in PDF File Properties
 2018-10-30 12:20:12 +01:00
Laurent Destailleur
f88b922d9d
Merge pull request #9908 from frederic34/patch-26 
Update box_graph_product_distribution.php
 2018-10-30 12:19:45 +01:00
Laurent Destailleur
5935a420a8
Merge pull request #9886 from frederic34/catchblockempty 
fill empty catch with log
 2018-10-30 12:16:41 +01:00
John BOTELLA
1e819ca7c1 FIX special code on create supplier invoice from supplier order 2018-10-30 10:46:33 +01:00
John BOTELLA
ca47d1b8b1 Fix clone fourn order and invoice lines special code 2018-10-30 10:26:59 +01:00
Abbes Bahfir
7f7df8d001 Fix: To be possibly intercepted : create, update and delete of the object instead of commonobject must be called 2018-10-30 09:03:33 +01:00
Frédéric FRANCE
450a837393
make play and playdisable equals 2018-10-29 18:50:15 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4 Fix deletion of draft invoice 2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6 Fix perm to delete 2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219 FIX Delete of draft invoice 2018-10-29 14:35:42 +01:00
Regis Houssin
977a88363e FIX missing multidir_output for supplier modules 2018-10-29 12:50:40 +01:00
Regis Houssin
6e2d62bea6 FIX wrong entity id 2018-10-29 12:30:36 +01:00
Laurent Destailleur
0500f54237 Email collector 2018-10-29 11:29:08 +01:00
Laurent Destailleur
d8bf635530 Prepare module 2018-10-29 11:21:57 +01:00
Regis Houssin
9e3800d7fd FIX missing entity filter for stock 2018-10-29 11:14:05 +01:00
atm-ph
c83e67123d Fix pgsql : operator does not exist: timestamp without time zone ~~ unknown 2018-10-29 11:04:16 +01:00
Regis Houssin
31497e867f FIX missing entity filter 2018-10-29 11:01:02 +01:00