Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,811 Commits 36 Branches 189 Tags
53aed716e84f134e8de45cb15b12137bfae345dc
Commit Graph

26778 Commits

Author SHA1 Message Date
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Laurent Destailleur
f0d163a4ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-05 15:28:54 +02:00
Laurent Destailleur
8e4c89673a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2022-04-05 15:28:43 +02:00
Florian HENRY
1fec350ccc fix: Bad dirthday displayed date (d-1) in the Bithday Widget 2022-04-04 22:51:30 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
Laurent Destailleur
2913759bb7 Fix syntax 2022-04-04 10:45:50 +02:00
Laurent Destailleur
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/compta/accounting-files.php
 2022-04-03 17:27:15 +02:00
kamel
11d4e85a39 FIX - Fiw default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions 2022-04-01 16:52:59 +02:00
Laurent Destailleur
0c27578e69 Merge pull request #20233 from marc-dll/13.0_FIX_clone_with_unique_extrafields 
FIX: object cloning: set unique extrafield values to null to prevent duplicates
 2022-04-01 14:49:25 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
ad8e0a3be5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:36 +02:00
Laurent Destailleur
6e4ed58be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:26 +02:00
Florian Mortgat
5df5050418 Apply suggestions from code review 
replace spaces with tabs
 2022-04-01 09:14:04 +02:00
atm-florian
ce83fa9f7e FIX missing call to executeHooks() 2022-03-31 17:34:24 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
 2022-03-29 15:02:29 +02:00
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
e300f270fe FIX bad status of member on widget by type and status 2022-03-29 10:54:35 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
Marc de Lima Lucio
1c43617d93 FIX: contact card: single extrafield update failed 2022-03-24 17:34:50 +01:00
Laurent Destailleur
01396cc07a Code comment 2022-03-23 15:58:55 +01:00
Laurent Destailleur
bf7c707d05 Doc 2022-03-21 11:11:36 +01:00
Laurent Destailleur
3293a6f8b8 Fix position of table on new page of PDF 2022-03-19 19:40:20 +01:00
Laurent Destailleur
d5dc29e794 Fix position of image on line 2022-03-19 19:26:58 +01:00
Laurent Destailleur
592a277091 FIX ZATCA Encoding 2022-03-19 19:17:22 +01:00
Laurent Destailleur
9878b04a98 Fix position of text in PDF 2022-03-19 18:20:24 +01:00
Laurent Destailleur
62ca286ac9 Try a fix to solve backup that fails on large database 2022-03-18 12:07:00 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
Laurent Destailleur
4aa93b363a FIX #20387 2022-03-17 11:24:23 +01:00
Laurent Destailleur
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
 2022-03-17 00:15:01 +01:00
Laurent Destailleur
5eb51979a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-17 00:12:17 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
3346d64416 Merge pull request #20305 from fmarcet/14.0 
Fix: Error whem generating supplier payment pdf
 2022-03-16 22:46:53 +01:00
Laurent Destailleur
5b2e1fc374 Merge pull request #20306 from fmarcet/15.0 
Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work
 2022-03-16 22:41:54 +01:00
Laurent Destailleur
090b5c41bf Merge pull request #20316 from atm-gauthier/14.0_fix_round_unitprice_with_MU 
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
 2022-03-16 22:34:49 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-03-16 20:34:30 +01:00
Laurent Destailleur
abbc2ca909 Merge pull request #20377 from aspangaro/14p31 
FIX Update icon of module reception
 2022-03-16 20:13:55 +01:00
Laurent Destailleur
14578820ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-16 20:10:52 +01:00
Laurent Destailleur
3c9ebfbe32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	.travis.yml
	htdocs/adherents/card.php
 2022-03-16 20:10:35 +01:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Laurent Destailleur
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
Laurent Destailleur
0102832679 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 16:01:55 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
ATM john
4f395a836e fix crabe multidir output 2022-03-16 12:10:10 +01:00
Laurent Destailleur
2205469fab Merge pull request #20343 from ptibogxiv/patch-7 
Fix for multicompany on online sign url
 2022-03-15 19:32:56 +01:00
Laurent Destailleur
d2d86ce53b Merge pull request #20353 from Hystepik/develop_v13#1 
Fix #20351 : top navbar no longer hiden in extarnal site
 2022-03-15 19:23:24 +01:00