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

83731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
b3b3042afc
Merge pull request #14308 from atm-lena/FIX_11.0_CommandFournFetch_Entity 
fetch() command fourn : Same management as commande.class.php of entity
 2020-07-29 13:01:13 +02:00
Laurent Destailleur
d9191c74d8
Update fournisseur.commande.class.php 2020-07-29 12:59:59 +02:00
Laurent Destailleur
cb8c8a1d50
Merge pull request #14305 from marc-dll/FIX_10.0_expedition_create 
FIX: shipping creation: checks not done on weight and sizes
 2020-07-29 12:59:23 +02:00
Laurent Destailleur
d2e730f8e5
Merge pull request #14310 from atm-gauthier/10.0_fix_wrong_column_order_by 
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
 2020-07-29 12:58:28 +02:00
Laurent Destailleur
c4b3781df0
Merge pull request #14315 from OPEN-DSI/v10-fix-contact-list-redirect-main-search 
FIX redirect on contact card from main search
 2020-07-29 12:25:38 +02:00
lvessiller
8ee5b16e89 FIX redirect on contact card from main search 2020-07-29 12:00:22 +02:00
VERDOL Gauthier
d214dbb5fd FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total 2020-07-28 15:42:54 +02:00
atm-lena
b480fb2dfc Delete double line 2020-07-28 15:32:58 +02:00
atm-lena
9f0c3b0db1 fetch() command fourn : Same management as commande.class.php of entity 2020-07-28 15:13:56 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Marc DLL
ee55b82a8d FIX: shipping creation: checks not done on weight and sizes 2020-07-27 23:27:44 +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
FlorianMortgat
93348630bf FIX 11.0: computation of the bottom margin of <body> returns NaN because body is not loaded yet 2020-07-25 11:05:05 +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
a6e728a4d8
Merge pull request #14246 from fappels/11_fix_date_fourn_price_log 
FIX: date in supplier price log tooltip.
 2020-07-24 13:18:36 +02:00
Laurent Destailleur
4e4e737ff2
Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link 
FIX : wrong link to third invoice templates
 2020-07-24 13:13:15 +02:00
Laurent Destailleur
cd5982e45f
Merge pull request #14273 from fbosman/patch-3 
Specific email-adresses for invoice, shipment and order-confirmation
 2020-07-24 12:58:47 +02:00
Laurent Destailleur
ff4ec934e9
Merge pull request #14277 from atm-quentin/fix_warning_total 
FIX warning
 2020-07-24 12:55:24 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
Laurent Destailleur
c699d71abc
Merge pull request #14281 from ATM-Consulting/11.0_fix_multicurency_option_not_applied 
Fix multicurecy option not applied
 2020-07-24 12:54:27 +02:00
Laurent Destailleur
6261fa191f Prepare compatibilty with mysql 8 2020-07-24 12:47:29 +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