Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
97bb04c5b0
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-18 16:31:51 +02:00
Laurent Destailleur
a2db39e374
Merge pull request #18756 from mschamp/develop 
Show inventory in table toConsume
 2021-09-18 16:18:29 +02:00
Laurent Destailleur
a81ee14593
Update mo_production.php 2021-09-18 16:18:09 +02:00
Laurent Destailleur
91bf2a8d77
Update mo_production.php 2021-09-18 16:16:28 +02:00
Laurent Destailleur
c37767c5a0
Update mo_production.php 2021-09-18 16:15:21 +02:00
Laurent Destailleur
e9e0258444
Update mo_production.php 2021-09-18 16:14:42 +02:00
Laurent Destailleur
b8d37ec37e
Update mo_production.php 2021-09-18 16:12:10 +02:00
Laurent Destailleur
002703e724
Merge pull request #18746 from BlueGarm/patch-1 
Product name in inventory list
 2021-09-18 16:09:48 +02:00
Laurent Destailleur
30fb0d65bd
Merge pull request #18745 from Hystepik/develop#1 
Fix actions_addupdatedelete.inc.php on lang
 2021-09-18 16:09:04 +02:00
Laurent Destailleur
9e0a7c4687
Merge pull request #18748 from Hystepik/develop#4 
New : validate massaction KM
 2021-09-18 16:08:43 +02:00
Laurent Destailleur
061cbc4266
Merge pull request #18750 from maksimstojkovic/develop 
Fix Warehouse PDF Generation Error
 2021-09-18 16:08:16 +02:00
Laurent Destailleur
c72ce007b8
Merge pull request #18752 from maksimstojkovic/new-enable-pdf-stock-list 
New Enable PDF Regeneration in Warehouse List
 2021-09-18 16:08:01 +02:00
Laurent Destailleur
39d55b11b4
Merge pull request #18753 from maksimstojkovic/fix-movement-typo 
Fix typo in pdf_standard.modules.php
 2021-09-18 16:07:41 +02:00
Laurent Destailleur
47c7725076
Merge pull request #18757 from ptibogxiv/patch-444 
Fix error when adding sql filter with hook in knowledgerecord
 2021-09-18 16:07:27 +02:00
Laurent Destailleur
052511d081 Fix sql error 2021-09-18 15:05:31 +02:00
ptibogxiv
5bb50ec951
Fix error when adding sql filter with hook in knowledgerecord 2021-09-18 13:47:18 +02:00
Laurent Destailleur
0bf213acac Code comment 2021-09-18 13:25:12 +02:00
Laurent Destailleur
2810315dc5 Fix payment of registration of event 2021-09-18 13:19:29 +02:00
mschamp
a231b44aae
Merge branch 'Dolibarr:develop' into develop 2021-09-18 12:58:02 +02:00
mschamp
018dbca5c0
Show inventory in table toConsume 
Add a column with the reel inventory to the production screen of manufacturing orders.
This gives the user an indication if production is possible.
 2021-09-18 12:51:32 +02:00
Laurent Destailleur
5fa62f25fa Fix registration of attendee 2021-09-18 12:39:26 +02:00
Laurent Destailleur
ceb368abd4 Fix message 2021-09-18 12:29:35 +02:00
Laurent Destailleur
0168a9860b Fix tooltip on website syntax disappear 
Fix backard compatibility of getLabelStatus
 2021-09-18 12:09:08 +02:00
Laurent Destailleur
dafc7d2617 Fix bad position of picto 2021-09-18 11:34:15 +02:00
Laurent Destailleur
ddcb4c149a css 2021-09-18 11:32:58 +02:00
Laurent Destailleur
0859438118 Show public and private note of attendee 2021-09-18 11:25:29 +02:00
Laurent Destailleur
66e58004fb Add column max_attendees for an event 2021-09-18 11:10:00 +02:00
Laurent Destailleur
0c67185dcf Add note on registration 2021-09-18 11:03:15 +02:00
Erik van Berkum
572e7d8fe0
Merge branch 'Dolibarr:develop' into develop 2021-09-18 12:33:10 +09:00
Maksim Stojkovic
25111d47ee
New Enable PDF Regeneration in Stock List 
Enables PDF Regeneration in warehouse stock list
 2021-09-18 03:51:12 +10:00
Laurent Destailleur
675a30d500 Fix phpcs 2021-09-17 19:42:41 +02:00
Laurent Destailleur
b1c6a6e8d1 Fix show/hide combo when next combo has no item inside. 2021-09-17 19:38:55 +02:00
Laurent Destailleur
68a391b395 Fix not empty second level combo if first one not yet defined 2021-09-17 19:19:41 +02:00
Laurent Destailleur
7ed9e21266 Fix sql error 2021-09-17 19:16:46 +02:00
Maksim Stojkovic
d69ef7c134 Fix typo in pdf_standard.modules.php 2021-09-18 03:12:13 +10:00
Laurent Destailleur
446cc082e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-17 16:53:26 +02:00
Laurent Destailleur
91cd991828 Simplify the selectgroupTicket. 2021-09-17 16:52:42 +02:00
Maksim Stojkovic
44ff73f5de
Remove unused $nblines assignment 
Fixes the following warning received when attempting to generate a warehouse stock document using the default template:
`count(): Parameter must be an array or an object that implements Countable in /var/www/html/core/modules/stock/doc/pdf_standard.modules.php on line 211`.

$nblines is subsequently assigned on line 326, after which it is then used.
 2021-09-17 23:50:00 +10:00
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +02:00
Lucas Marcouiller
51f80bbc68 New : validate massaction KM 2021-09-17 15:09:21 +02:00
Mikaël MARTIN
7c4fe41e84
Update inventory.php 
Add the product name after the reference for better visualization during inventories.
 2021-09-17 13:17:23 +02:00
Lucas Marcouiller
e7a32834b7 Fix actions_addupdatedelete.inc.php on lang 2021-09-17 12:55:09 +02:00
Laurent Destailleur
6e3b91f268 Trans 2021-09-17 12:38:06 +02:00
Laurent Destailleur
7a9ea1e8e0
Merge pull request #18608 from ptibogxiv/patch-442 
fix entity knowledgerecord
 2021-09-17 12:32:41 +02:00
Laurent Destailleur
9784a8207c
Merge branch 'develop' into patch-442 2021-09-17 12:32:14 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Laurent Destailleur
505517d142
Merge pull request #18629 from Gjuju/12.0 
Fix : GET extrafields on API "get events list" requests
 2021-09-17 12:16:32 +02:00
Laurent Destailleur
58fd4ad92f
Merge pull request #18641 from Gecka-Apps/14.0-fix-takepos-payment-methods 
14.0 fix takepos payment methods
 2021-09-17 12:15:35 +02:00
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right 
CLOSE #18689 REST API module: add api key generate / modify right.
 2021-09-17 12:10:03 +02:00