Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,048 Commits 36 Branches 190 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

19498 Commits

Author SHA1 Message Date
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
florian HENRY
c4d8a25c5a fix external module multidiroutput 2020-08-10 13:40:55 +02:00
Ferran Marcet
10df9777b5 FIX: Visualization rights correction on last modified contacts box 2020-08-10 09:53:20 +02:00
Laurent Destailleur
ada7b74ba1 Fix phpcs 2020-08-07 14:56:30 +02:00
Laurent Destailleur
5482a3134a Merge pull request #14355 from fmarcet/10.0 
Fix: User can see events that are not assigned to it
 2020-08-07 14:54:39 +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
Laurent Destailleur
37f1b27bd2 Fix phpcs 2020-08-06 03:55:47 +02:00
Laurent Destailleur
b40177a8c8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 03:00:16 +02:00
Laurent Destailleur
641d9a6565 Fix number to string 2020-08-06 02:58:07 +02:00
Laurent Destailleur
ce960c8d0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:53:19 +02:00
Laurent Destailleur
0b7aec1fa0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functionsnumtoword.lib.php
 2020-08-06 02:52:54 +02:00
Laurent Destailleur
73ea5b0e2d Fix function to convert price to string 2020-08-06 02:50:24 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
ef0f7cfa6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-06 02:08:15 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
 2020-08-06 02:08:04 +02:00
Laurent Destailleur
9cb5735165 FIX Bad address used for vendor on PDF standard of supplier payment 2020-08-06 02:05:55 +02:00
stickler-ci
8d88217434 Fixing style errors. 2020-08-04 14:48:15 +00:00
Ferran Marcet
70ad2fcee0 Fix: User can see events that are not assigned to it 2020-08-04 16:45:57 +02:00
Ferran Marcet
7a077a2d99 Fix: User can see events that are not assigned to it 2020-08-04 16:45:04 +02:00
Ferran Marcet
1a62a36b86 Merge remote-tracking branch 'origin/10.0' into 10.0 2020-08-04 16:40:01 +02:00
Ferran Marcet
7b6ef7aca8 Merge branch '10.0up' into 10.0 2020-08-04 16:39:40 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +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
stickler-ci
9926eac192 Fixing style errors. 2020-08-03 09:26:36 +00:00
quentin
72b2fb442b fix test libelle 2020-08-03 11:17:39 +02:00
Ferran Marcet
63b15dd1b6 Fix: User can see events that are not assigned to it 2020-08-03 11:17:30 +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
altairis
448cd1cd36 Merge branch '10.0' into fixsizewithff 2020-07-31 12:23:57 +02:00
altairis
9a9eef428b fix duration fields size with firefox 2020-07-31 12:22:21 +02:00
Laurent Destailleur
d08b3513dc Merge pull request #14247 from FHenry/11.0_fix_commerce_MenuSupplierORderOnly 
fix display Commerce top menu user only supplier order rights and MAIN_MENU_HIDE_UNAUTHORIZED=1
 2020-07-29 14:27:14 +02:00
Laurent Destailleur
6a5427ee4f Merge pull request #14274 from atm-quentin/FIX_null_required 
FIX null required
 2020-07-29 14:13:53 +02:00
Laurent Destailleur
3d79950c27 Update commonobject.class.php 2020-07-29 14:13:29 +02:00
Laurent Destailleur
930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/lib/pdf.lib.php
 2020-07-29 13:50:31 +02:00
Laurent Destailleur
566f683c54 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:19 +02:00
VERDOL Gauthier
25994e61bc FIX : We need to see unit line on PDF even though it's an option 2020-07-27 16:04:21 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
Laurent Destailleur
943e7c988f Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Frans Bosman
e2592d9049 Update card_presend.tpl.php 
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
 2020-07-22 11:44:26 +02:00
florian HENRY
2c5e96bb28 better fix 2020-07-20 09:01:21 +02:00
florian HENRY
d2e528d8c1 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:45 +02:00
florian HENRY
3148a181e7 fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1 2020-07-15 17:45:34 +02:00
Laurent Destailleur
fd95551940 Fix upload of file in import module 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-07-09 21:52:27 +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