Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-10 01:42:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 39 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

72072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
François J
2dd69c3735 Hide buttons when action is presend email 2018-11-06 16:51:48 +01:00
Laurent Destailleur
1e801c7c8a Fix css 2018-11-06 16:50:31 +01:00
François J
29c71b31fe [New] Add Presend form & Actions to send emails to Contact card 
Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.
 2018-11-06 16:40:39 +01:00
François J
f9a8b240ac Add PredefinedMailContentContact lang string 2018-11-06 15:05:03 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Destailleur
ae8120041e Typo 2018-11-06 10:07:46 +01:00
Laurent Destailleur
7f4276cd6f Update doc 2018-11-06 10:07:28 +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
8.0.3 		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
02eaaaa53e Merge pull request #9934 from atm-maxime/fix_mandatory_tracking 
Fix tracking field in dictionnary should not be mandatory #8919
 2018-11-05 09:22:24 +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
Laurent Destailleur
63454c4e88 Merge pull request #9949 from frederic34/patch-15 
typo
 2018-11-05 09:16:55 +01:00