Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
88,137 Commits 36 Branches 189 Tags
041decaf93c9e1481251a3ccd51f5ea9e38bd9b1
Commit Graph

8231 Commits

Author SHA1 Message Date
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
 2020-08-17 19:54:23 +02:00
Laurent Destailleur
8bfa6df1a6 FIX Update extrafields on line only if it is supported 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2020-08-17 16:06:36 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00
Laurent Destailleur
030df58fea Fix regression in sending emails 2020-08-07 17:11:23 +02:00
Laurent Destailleur
795754273e Fix regression in sending emails 2020-08-07 17:06:57 +02:00
Laurent Destailleur
bd5c4603e3 Fix regression in sending emails 2020-08-07 17:06:12 +02:00
Laurent Destailleur
00804c1020 Complete fix for #14146 2020-08-07 15:19:26 +02:00
Laurent Destailleur
284378232b Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam 
FIX :  JS CRASH - bad usage of moreparam
 2020-08-07 10:10:09 +02:00
florian HENRY
46cafcc445 Merge branch '11.0' into 12.0 2020-08-06 16:54:49 +02:00
florian HENRY
3e6ae9bebf Merge branch '10.0' into 11.0 2020-08-06 16:34:45 +02:00
florian HENRY
53acd8cffd FIX: MAIN_MAIL_FORCE_SENDTO work now for all mail sending method 2020-08-06 16:28:17 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
VERDOL Gauthier
2d192431bc FIX : wrong element var for fetch_name_optionals_label function with expeditions 2020-08-03 14:59:51 +02:00
Laurent Destailleur
defbd26f95 Help to fight errors ErrorBadValueForParamNotAString 2020-08-03 12:33:22 +02:00
Laurent Destailleur
c2bb0431f0 FIX input field of extrafields must keep data if form submit fails. 2020-08-03 12:31:30 +02:00
Laurent Destailleur
d59bcd3f5b FFIX error creating record when extrafields price exists in other entity 2020-08-03 12:08:33 +02:00
Laurent Destailleur
ecfdb4bbac Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-02 16:02:09 +02:00
Laurent Destailleur
5e6254634f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-02 16:01:13 +02:00
Laurent Destailleur
1edfa4a4fb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-08-02 16:01:03 +02:00
Laurent Destailleur
8c4b4e233d Merge pull request #14317 from fappels/12_show_virtual_stock 
Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
 2020-08-02 01:32:18 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
8b879ee23b FIX Edit extrafield of type long text loose carriage returns 2020-07-30 14:49:00 +02:00
Francis Appels
54410189bc Fix hidden option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO 
When product ajax search used a dash is show, so virtual stock looks like being negative value.
 2020-07-29 17:00:39 +02:00
Laurent Destailleur
3d79950c27 Update commonobject.class.php 2020-07-29 14:13:29 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
f68be08c67 Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve 
Improve printStdColumnContent by passing the $pdf object
 2020-07-24 13:20:03 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Laurent Destailleur
cbc8187616 Merge pull request #14205 from Gecka-Apps/12.0-fix-extra-field-ordering 
Fix extrafields ordering on PDFs
 2020-07-18 19:30:34 +02:00
Laurent Destailleur
b8721e0c64 FIX Change position of line in BOM 2020-07-09 16:00:15 +02:00
Laurent Dinclaux
6ed2ae188e Fix extrafields ordering on PDFs 2020-07-10 00:51:41 +11:00
Laurent Dinclaux
37401df106 Improve printStdColumnContent by passing the $pdf object. 
It isn't possible to replace the pdf edition done by this method without the $pdf object.
 2020-07-08 14:48:34 +11:00
Laurent Destailleur
b726e96f4b FIX Update form erased extrafields that were hidden 2020-07-04 17:09:20 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
03aa4873d1 Merge pull request #14141 from fappels/12_fix_extrafield_html 
FIX html lost on html extrafield
 2020-07-03 00:49:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Laurent Destailleur
d3c23428d5 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:11:13 +02:00
Laurent Destailleur
324c8e9b54 FIX Use of office365 TLS with SMTPs method. 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-07-01 17:10:33 +02:00
Laurent Destailleur
92a36dbeee FIX Use of office365 TLS with SMTPs method. 2020-07-01 17:01:46 +02:00
Francis Appels
5d65b5f660 fix html should not do price2num 2020-06-29 09:07:54 +02:00
Francis Appels
731978fda6 FIX html lost on html extrafield 2020-06-28 16:33:44 +02:00
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
443558e3a2 Fix phpcs 2020-06-27 01:57:01 +02:00