Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-05 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 39 Branches 191 Tags
9165ea9e673a0e4f743d43a627cda170ce5547eb
Commit Graph

78410 Commits

Author SHA1 Message Date
Laurent Destailleur
f26a287d10 Update api_supplier_invoices.class.php 2020-08-16 23:50:01 +02:00
Laurent Destailleur
b7c38f4617 Merge pull request #14433 from c3do/patch-1 
NEW Triggers Attributes and Attributes values
 2020-08-16 23:45:32 +02:00
Laurent Destailleur
a76d4daff8 Merge pull request #14444 from fmarcet/11.0 
FIX: Visualization rights correction on last modified contacts box
 2020-08-16 23:37:23 +02:00
Laurent Destailleur
99809b487e Standardize code 2020-08-16 23:33:50 +02:00
Laurent Destailleur
816aeadcba Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge 
NEW : Declinaison price level compatibility
 2020-08-16 23:18:49 +02:00
Laurent Destailleur
657e6a2037 No warning 2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +02:00
Laurent Destailleur
c407a19563 Remove type= from script tags 2020-08-16 22:03:11 +02:00
Laurent Destailleur
8992d38bea Merge pull request #14482 from b92/develop 
NEW Add __MEMBER_TYPE__ substitution key
 2020-08-16 21:17:09 +02:00
Laurent Destailleur
03e8a0737c Merge pull request #14481 from OPEN-DSI/v10-html-formfile-add-param-entity 
FIX param entity in html form file
 2020-08-16 21:16:28 +02:00
Laurent Destailleur
f6c1a14d50 CSS 2020-08-14 21:22:45 +02:00
josemariagomezroncero
134bd11f47 Update mails_templates.php 2020-08-14 21:19:51 +02:00
Laurent Destailleur
695420eb8b CSS 2020-08-14 21:18:06 +02:00
Laurent Destailleur
2adac8e233 CSS 2020-08-14 21:11:55 +02:00
Bernard Saulme
52b84a3ea2 Update functions.lib.php 2020-08-14 18:08:59 +02:00
Laurent Destailleur
73c1184195 Fix phpcs 2020-08-14 13:23:41 +02:00
Laurent Destailleur
65ceaac42e Better message 2020-08-14 12:56:17 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
Laurent Destailleur
6851e24c3b Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2020-08-14 12:02:40 +02:00
Laurent Destailleur
d8c6e17efd Fix travis 2020-08-14 11:59:51 +02:00
Laurent Destailleur
fe0b1c5ee4 Fix travis 2020-08-14 11:53:54 +02:00
Laurent Destailleur
52f20a1047 Fix travis 2020-08-14 11:52:21 +02:00
Laurent Destailleur
a916f6af59 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +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
2b393d04e1 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0 2020-08-14 11:03:48 +02:00
Laurent Destailleur
d35c7ed49b Fix trans 2020-08-14 11:03:12 +02:00
Laurent Destailleur
9e8ed3bf54 Merge pull request #14445 from atm-john/11.0_fix_lang 
Fix lang fr
 2020-08-14 03:28:42 +02:00
Laurent Destailleur
74da63c0e4 Merge pull request #14448 from 418sec/develop 
Security Fix for Cross-site Scripting (XSS) - huntr.dev
 2020-08-14 03:17:35 +02:00
Laurent Destailleur
a2f50770f8 Merge pull request #14449 from cfoellmann/default-unit 
set default unit to `PRODUCT_USE_UNITS` value
 2020-08-14 03:04:09 +02:00
Laurent Destailleur
f0046672fc Merge pull request #14461 from atm-john/NEW_fill_service_dates 
NEW: new line template: hidden conf to fill service dates from the last service line
 2020-08-14 02:50:24 +02:00
Laurent Destailleur
1d18c83439 Merge pull request #14463 from andreubisquerra/develop 
Avoid empty sales and orders when all lines are removed.
 2020-08-14 02:48:48 +02:00
Laurent Destailleur
aeb11344c6 Merge pull request #14464 from atm-thibaultf/FIX_allow_float_on_stock_alert 
Allow float for stock limit alert and desired stock
 2020-08-14 02:46:08 +02:00
lvessiller
f385e02c53 FIX title button attribute id empty 2020-08-13 17:43:18 +02:00
stickler-ci
d784c621c9 Fixing style errors. 2020-08-13 15:07:06 +00:00
Adrien Raze
990217fcb0 FIX : task leftmenu 2020-08-13 16:59:27 +02:00
Laurent Destailleur
7ce1d36b59 FIX Category for suplements not saved 2020-08-13 13:51:08 +02:00
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
stickler-ci
959ccce777 Fixing style errors. 2020-08-13 09:48:28 +00:00
John Botella
2405082bb1 Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge 2020-08-13 11:46:07 +02:00
John Botella
4e1f554c15 Fix - add variation price fallback behavior 2020-08-13 11:43:33 +02:00
Laurent Destailleur
f22398a9d3 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2020-08-12 20:26:01 +02:00
Laurent Destailleur
355d62e7db FIX Update line of BOM 2020-08-12 20:24:44 +02:00
stickler-ci
1cc673a9c6 Fixing style errors. 2020-08-12 08:53:24 +00:00
John Botella
41cbe6db12 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge 2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf Add declinaison price level 2020-08-12 10:14:29 +02:00
atm-thibaultf
10810bc5bb Modify int to float for stock limit alert and desired stock 2020-08-12 09:09:59 +02:00
andreubisquerra
8c5a86cb72 Avoid empty sales and orders when all lines are removed. 2020-08-12 07:07:18 +02:00
stickler-ci
ef78b85062 Fixing style errors. 2020-08-11 10:42:27 +00:00
John Botella
47e664df8d Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates 2020-08-11 12:28:40 +02:00