lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,755 Commits 43 Branches 150 Tags 886 MiB
dd773d33fd
Commit Graph

83755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dd773d33fd Fix phpcs 2020-08-07 14:57:52 +02:00
Laurent Destailleur
ada7b74ba1 Fix phpcs 2020-08-07 14:56:30 +02:00
Laurent Destailleur
47cf447310 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-07 12:10:08 +02:00
Laurent Destailleur
68a3716fd2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/projet/info.php
 2020-08-07 12:09:58 +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
921be56379
Merge pull request #14400 from atm-quentin/FIX_project_info_right_access 
fix right project info.php
 2020-08-07 10:01:41 +02:00
quentin
215242a4a1 fix right project info.php 2020-08-06 14:11:26 +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
Laurent Destailleur
c8bff3a71e FIX Cannot redeclare class 2020-08-06 02:05:04 +02:00
John Botella
11f14b8fe5 Fix bad usage of moreparam 2020-08-04 14:13:52 +02:00
Laurent Destailleur
241a97fd19 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-04 13:41:26 +02:00
Laurent Destailleur
83a9be2428 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-04 13:41:19 +02:00
Laurent Destailleur
bd8e8a4087
Merge pull request #14351 from atm-quentin/FIX_product_label_desc_update 
FIX product label and desc were never updated when modifying trans
 2020-08-04 13:07:41 +02:00
Laurent Destailleur
b0cafd47a0
Merge pull request #14354 from atm-quentin/FIX_test_libelle_pdf 
fix check also field "libelle"
 2020-08-04 12:57:44 +02:00
Laurent Destailleur
f11accf4c2
Merge pull request #14359 from atm-quentin/FIX_missing_conf_on_supplier_order 
FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order
 2020-08-04 12:48:39 +02:00
Laurent Destailleur
085fe5f7ba
Merge pull request #14361 from atm-gauthier/11.0_substitution 
FIX : wrong element var for fetch_name_optionals_label function with expeditions
 2020-08-04 12:47:33 +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
quentin
bbfca90260 FIX Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf in supplier order 2020-08-03 11:54:26 +02:00
quentin
72b2fb442b fix test libelle 2020-08-03 11:17:39 +02:00
quentin
b026896a98 FIX product label and desc were never updated when modifying trans 2020-08-03 10:33:48 +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
b57ec55812 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-02 15:58:13 +02:00
Laurent Destailleur
91db3b9344
Merge pull request #14323 from altatof/fixsizewithff 
FIX : duration fields size with firefox
 2020-08-02 01:25:11 +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
9dc904f0a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-07-29 16:03:03 +02:00
Laurent Destailleur
491f72accc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-07-29 16:02:07 +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
2c12a761ee
Merge pull request #14283 from atm-john/11.0_fix_mysql_update 
Fix MySQL rank usage for column
 2020-07-29 13:56:20 +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
ab4b1b1f29 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:48:18 +02:00
Laurent Destailleur
4a291f181f Fix regression 2020-07-29 13:47:04 +02:00
Laurent Destailleur
c93a4c7fc0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:27 +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
Laurent Destailleur
454a804b4e
Merge pull request #14299 from atm-gauthier/9.0_hidden_unit 
FIX : We need to see unit line on PDF even though it's an option
 2020-07-29 13:18:17 +02:00
Laurent Destailleur
878b268a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-29 13:11:10 +02:00
Laurent Destailleur
377e331e6a
Merge pull request #14288 from atm-florianm/FIX_11.0_debugbar_body_bottom_margin_offset 
FIX 11.0: DebugBar hides content at page bottom
 2020-07-29 13:10:56 +02:00
Laurent Destailleur
6bd450dcd0 Doc 2020-07-29 13:10:31 +02:00