lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,206 Commits 43 Branches 150 Tags 886 MiB
079fcacf13
Commit Graph

10408 Commits

Author SHA1 Message Date
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +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
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
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
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
oscim
41fa1f968b
Update notify.class.php 
add in var $parameters transmited in hook 
outputlangs and labeltouse for customise by hook
 2022-03-16 12:30:30 +01:00
Laurent Destailleur
97fc58c799
Merge pull request #20354 from fappels/14_fix_set_move_stock_on_close_wehen_batch 
FIX: Stock move on shipment close and reception close disabled for lot/serial type
 2022-03-15 19:21:37 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
Florian HENRY
92bfd6893d fix:incoterm bad sql request 2022-03-15 09:10:41 +01:00
Francis Appels
207aba2e98 FIX: Stock move on shipment close and reception close also moves lot/serial type. 2022-03-14 17:59:18 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
f72f71a972 FIX Delete of doc and package in modulebuilder 2022-03-11 16:21:28 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Ferran Marcet
a14bf4b621 Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work 2022-03-08 18:02:55 +01:00
Laurent Destailleur
b339e1a883 Enhance phpunit on sql code testing 2022-03-07 19:37:53 +01:00
Laurent Destailleur
6e298a2cb4 Fix phpunit 2022-03-07 19:18:32 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump 
NEW -  Add util function send backup by mail
 2022-03-07 17:37:44 +01:00
Laurent Destailleur
5bde2b3489 Merge 2022-03-07 16:42:47 +01:00
Laurent Destailleur
c4036345b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-07 16:42:28 +01:00
Laurent Destailleur
dd9f10b1b6
Merge pull request #20186 from atm-kevin/FIX_Add_Id_In_Formproject 
FIX : Add ID into formproject method
 2022-03-07 16:34:04 +01:00
Laurent Destailleur
1ecdc7bc20 css 2022-03-07 16:30:39 +01:00
Laurent Destailleur
fb2fb46d17 FIX Drag and drop line of files on join files tab 2022-03-07 16:04:55 +01:00
Laurent Destailleur
403db246bb
Merge pull request #20280 from Achicken7301/develop 
Add unit price for {DOL_PRINT_OBJECT_LINES}
 2022-03-07 13:44:03 +01:00
Laurent Destailleur
edaf740e78
Update dolreceiptprinter.class.php 2022-03-07 13:43:16 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Khang
9cada04261 Add unit price for "free-text product" receipt 2022-03-05 16:58:37 +07:00
Khang
d326fe02cf Feature: unit price for {DOL_PRINT_OBJECT_LINES} 
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
 2022-03-05 07:02:36 +07:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
kevin
ad5a18996d Replace id by class 2022-03-02 21:00:07 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00
Laurent Destailleur
66b0f253b6 Clean code 2022-03-02 12:41:21 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
8c94c2f98c Fix collapse icon 2022-03-01 04:10:50 +01:00
Laurent Destailleur
e4e08c9903 Code simpler to manage collapse of separators. 2022-03-01 04:02:06 +01:00
Laurent Destailleur
54bef2e34f Fix phpcs 2022-03-01 01:57:38 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop 
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
 2022-02-28 21:56:01 +01:00
Laurent Destailleur
8e1fd877f2
Update html.formaccounting.class.php 2022-02-28 21:55:30 +01:00
Laurent Destailleur
50602b1fbe
Update html.formaccounting.class.php 2022-02-28 21:53:05 +01:00