lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,465 Commits 43 Branches 150 Tags 886 MiB
76fc8330a3
Commit Graph

87465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
76fc8330a3 Fix for wampserver3_64 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2020-09-13 13:47:46 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
ae857e7008
Merge pull request #14673 from atm-john/11.0_fix_loadlang_cron 
FIX Cron load lang
 2020-09-12 01:32:17 +02:00
Laurent Destailleur
ec13d3811e
Merge pull request #14706 from aspangaro/12.0p9 
FIX - Accountancy balance Error SQL on entity
 2020-09-12 01:17:04 +02:00
Laurent Destailleur
d44952011f
Update balance.php 2020-09-12 01:16:02 +02:00
Laurent Destailleur
0bdd1c0c17
Merge pull request #14701 from ATM-Nicolas/fix_wrong_redirection 
FIX : Wrong redirection
 2020-09-12 01:13:46 +02:00
Laurent Destailleur
134369ada9
Merge pull request #14707 from aspangaro/10.0_p41 
FIX Problems on FEC format
 2020-09-12 01:11:18 +02:00
Laurent Destailleur
29a45c46d5
Merge pull request #14712 from indelog/12.0 
Fix: short label of unit in Product::getLabelOfUnit()
 2020-09-12 01:10:13 +02:00
DEMAREST Maxime (Indelog)
e41afeacf4 Fix: short label of unit in Product::getLabelOfUnit 2020-09-11 15:34:11 +02:00
Alexandre SPANGARO
8fc9b78b47 FIX Problems on FEC format 2020-09-11 06:55:03 +02:00
Alexandre SPANGARO
04329c38b3 FIX - Accountancy balance Error SQL on entity 2020-09-11 06:42:22 +02:00
Laurent Destailleur
05a2fc6186 Fix rate for tunisia 2020-09-10 19:40:03 +02:00
Laurent Destailleur
358f8357f9 FIX #14703 2020-09-10 18:25:38 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
ATM-Nicolas
7944c21fe5 FIX : Wrong redirection 2020-09-10 12:32:12 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
b517050e17
Merge pull request #14672 from ATM-Nicolas/fix_api_static_property 
FIX : Static property called as non static
 2020-09-09 14:55:22 +02:00
Laurent Destailleur
c3ac446cf2
Merge pull request #14674 from ATM-Consulting/12.0_FIX_stock_is_not_rounded_on_product_list 
FIX: round stock value on product list
 2020-09-09 14:54:42 +02:00
Laurent Destailleur
5c34b26f39 FIX Look and feel v12: First tab must be name of object 2020-09-09 13:57:35 +02:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
John Botella
87d9dfa009 remove useless comm 2020-09-08 16:17:11 +02:00
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00
ATM-Nicolas
6bd6b285fd FIX : Static property called as non static 2020-09-08 16:03:18 +02:00
Laurent Destailleur
e7e05f47ac Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-07 14:26:07 +02:00
Laurent Destailleur
ca6e57b2f7 FIX Filter in "billed" of orders was not saved 2020-09-07 14:25:50 +02:00
Laurent Destailleur
92e231e121
Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty 
FIX: lang fr retained warranty
 2020-09-07 12:46:32 +02:00
John Botella
10d3405219 FIX: lang fr retained warranty 2020-09-07 12:21:00 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction 
Conflicts:
	htdocs/product/stock/product.php
 2020-09-04 19:38:56 +02:00
Laurent Destailleur
2e609d448c Fix error message 2020-09-04 16:30:34 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
b0a15f958f
Merge pull request #14619 from atm-john/11.0_fix_missing_param_for_hook 
FIX missing param for hook
 2020-09-03 12:24:56 +02:00
John Botella
c17bc8b3c8 Fix missing param for hook 2020-09-03 10:45:03 +02:00
Laurent Destailleur
162da37f1a
Merge pull request #14602 from ATM-Consulting/FIX_10.0_wrong_attachment_filenames_in_swiftmailer 
FIX 10.0 - when the mime file name is different from the filesystem n…
 2020-09-02 18:12:02 +02:00
Florian Mortgat
134a47a93f FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename 2020-09-01 15:36:35 +02:00
Laurent Destailleur
ffb3d810de Complete fix for #14580 for v10 (backport of change of develop) 2020-08-31 16:21:59 +02:00
Laurent Destailleur
4c0e1d20d6 FIX CSS 2020-08-30 05:28:01 +02:00
Laurent Destailleur
f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:13:20 +02:00
Laurent Destailleur
e4e5ca3934 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:41 +02:00
Laurent Destailleur
84b2929604 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:34 +02:00
Laurent Destailleur
eb0c76f613 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:08:59 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
Laurent Destailleur
68286199eb
Merge pull request #14574 from ATM-Consulting/11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot 
FIX 11.0 - expenses lines overlapping the total amounts frame
 2020-08-28 21:10:04 +02:00
FlorianMortgat
c25463a4ba + more parentheses around expression for readability 2020-08-28 21:07:11 +02:00
FlorianMortgat
173ad057f9 + parentheses around expression for readability 2020-08-28 20:46:35 +02:00
Laurent Destailleur
4d622316a8
Merge pull request #14579 from ATM-Consulting/10.0_FIX_wrong_supplier_unit_price_calculation_when_accepting_supplier_price_proposal 
FIX: unit price divided by quantity when accepting supplier price pro…
 2020-08-28 17:48:11 +02:00