Tim Otte
4e1a66916e
Merge branch 'develop' into fix-smtps-FORCE-SENDTO
2020-08-14 11:52:20 +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
Tim Otte
b57c2585ad
Fixed the smtps recipent to use the forced address
2020-08-14 10:00:40 +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
Laurent Destailleur
48323059e8
Merge pull request #14475 from atm-adrien/FIX_task_leftmenu
...
Fix missings tasks leftmenu parameters
2020-08-14 02:25:37 +02:00
Laurent Destailleur
04be66eab7
Merge pull request #14476 from OPEN-DSI/v10-fix-button-title-attr-id
...
FIX title button attribute id empty
2020-08-14 02:24:26 +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
Juanjo Menent
3eb23d3325
FIX: MySql Strict mode
2020-08-11 10:12:19 +02:00
Juanjo Menent
4e6b7289f2
FIX: MySql Strict mode
2020-08-11 10:07:38 +02:00
Juanjo Menent
b1735b0f80
FIX: MySql Strict mode
2020-08-11 10:02:46 +02:00
jove@bisquerra.com
3be723f3a1
NEW: Delayed payment in TakePOS
2020-08-11 07:49:54 +02:00
josemariagomezroncero
308dea92b3
Bug, this option disable topic input.
...
Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
2020-08-10 20:40:11 +02:00
stickler-ci
3e168f9495
Fixing style errors.
2020-08-10 14:06:22 +00:00
Christian Foellmann
821e7e2894
set default unit to PRODUCT_USE_UNITS value
2020-08-10 15:39:05 +02:00
Jamie Slome
7359c95efa
Merge pull request #9 from spooky360/develop
...
Fix for Self XSS vuln in dolibarr
2020-08-10 14:25:31 +01:00
John Botella
f014365b65
Fix lang fr
2020-08-10 10:35:50 +02:00
Ferran Marcet
10df9777b5
FIX: Visualization rights correction on last modified contacts box
2020-08-10 09:53:20 +02:00
Egil Priskorn
dd7e673aee
Update README.md
...
Written in PHP with optional JS
2020-08-09 17:24:09 +02:00
Egil Priskorn
ca465373ea
Update README.md
...
Remove some paragraphs that are not essential to new users and 2 new paragraphs about preferred partners and upgrading supported all the way from 2.8 to 12
2020-08-09 17:16:36 +02:00
Egil Priskorn
4aa71240d2
Update README.md
...
Fix spelling, grammar and a add a few clarifications.
2020-08-09 16:33:34 +02:00
Cédric
3f233a3200
Fix comment params
2020-08-08 23:01:41 +02:00
stickler-ci
d7a65a540e
Fixing style errors.
2020-08-08 20:58:51 +00:00
Cédric
9b00a1f61a
Some updates for attributes triggers
2020-08-08 22:48:21 +02:00
Cédric
ed1a2cd917
Update 1
2020-08-08 22:45:51 +02:00
Cédric
ef57bb7e84
pass $user to delete functions
2020-08-08 22:14:53 +02:00
