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
110,849 Commits 35 Branches 179 Tags 1.7 GiB
abcfbca77f
Commit Graph

98285 Commits

Author SHA1 Message Date
Laurent Destailleur
abcfbca77f
Update adherent_type.class.php 2022-07-11 11:36:59 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
e48fa05f9c
Merge pull request #21175 from altairis-melina/parameters 
NEW : TAKEPOS-Add setup parameters
 2022-07-11 01:54:27 +02:00
Laurent Destailleur
11fa745caa
Merge pull request #21198 from OPEN-DSI/develop_new_hook_virtual_product_stock 
NEW: Add new hook for show virtual stock details on product stock card
 2022-07-11 01:53:51 +02:00
Laurent Destailleur
30dff96ef4 Fix var_dump 2022-07-11 01:27:19 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Laurent Destailleur
2fb7b2285d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:04:11 +02:00
Laurent Destailleur
ae58a77208 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/card.php
 2022-07-11 00:03:39 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
6386432263 Fix missing migration 2022-07-11 00:01:33 +02:00
Laurent Destailleur
6b07daf40f Fix missing migration 2022-07-10 20:12:56 +02:00
Laurent Destailleur
bce8e28372
Merge pull request #21352 from badre-agtaib/new-#19511 
New #19511
 2022-07-10 19:49:35 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
e9b3d436ca css 2022-07-10 19:47:36 +02:00
Laurent Destailleur
a7515cb620
Merge pull request #21227 from ptibogxiv/patch-454 
NEW support of Stripe Terminal with Takepos
 2022-07-10 19:34:39 +02:00
Laurent Destailleur
bd3af19978
Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink 
NEW add objectLink on expedition
 2022-07-10 19:33:49 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
88543c85ba Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-10 19:22:15 +02:00
Laurent Destailleur
3d226801ba Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:22:02 +02:00
Laurent Destailleur
840d9b182b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-10 19:19:08 +02:00
Laurent Destailleur
52661e09c7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/modResource.class.php
 2022-07-10 19:18:59 +02:00
Laurent Destailleur
5de434eb37 css 2022-07-10 19:14:33 +02:00
Laurent Destailleur
c71616f45d css 2022-07-10 19:13:09 +02:00
Laurent Destailleur
442beec80d
Merge pull request #21344 from atm-steve/NEW_activate_all_services 
NEW Can set start and end dates and comment on button Activate all services
 2022-07-10 19:07:27 +02:00
Laurent Destailleur
2236ab53fe
Merge pull request #21321 from defrance/patch-208 
NEW : Create llx_element_categorie.sql
 2022-07-10 19:05:36 +02:00
Laurent Destailleur
16d04e475b
Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Laurent Destailleur
d7c1ca1083
Merge pull request #21461 from atm-gauthier/FIX/fetchByProductCombination2ValuePairs 
FIX : We must remove empty values from $features array in fetchByProduc…
 2022-07-10 18:57:31 +02:00
Laurent Destailleur
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action 
FIX default to create on card.php if $action is empty
 2022-07-10 18:50:48 +02:00
Laurent Destailleur
6059e4516f
Merge pull request #21475 from cfoellmann/PR/improve-page-title-2 
some more fixes to titles
 2022-07-10 18:48:58 +02:00
Laurent Destailleur
c16cd502d0
Update actions_massactions.inc.php 2022-07-10 18:43:25 +02:00
Laurent Destailleur
cccb453a05 Fix doc 2022-07-10 18:40:53 +02:00
Laurent Destailleur
b77c23979a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-10 18:40:31 +02:00
Laurent Destailleur
1a6c690a4a
Merge pull request #21482 from thomas-Ngr/14.0_fix_check_batch_on_reception 
check batch on receptions->addline when module is enabled
 2022-07-10 18:40:22 +02:00
Laurent Destailleur
8f819abd61 Fix doc 2022-07-10 18:35:23 +02:00
Laurent Destailleur
3fbaea6a93 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-10 18:25:22 +02:00
Laurent Destailleur
7e79cf2f0d
Merge pull request #21473 from badre-agtaib/backupwizard 
NEW #4482 adding js to hide/show advanced option
 2022-07-10 18:20:09 +02:00
Laurent Destailleur
99324bef0c
Merge pull request #21487 from fappels/16_fix_commonobject 
FIX regression by php8 fix on setVarsFromFetchObj
 2022-07-10 18:14:49 +02:00
Laurent Destailleur
09932000dd FIX online signature works partially on ODT templates. 2022-07-10 18:06:41 +02:00
Laurent Destailleur
3846520862 Trans 2022-07-10 14:55:36 +02:00
Francis Appels
6362cdfe2e FIX regression by php8 fix on setVarsFromFetchObj 2022-07-10 13:00:34 +02:00
stickler-ci
445add32e3 Fixing style errors. 2022-07-10 08:16:04 +00:00
ptibogxiv
1c61dda0dd
Update stripe.php 2022-07-10 10:11:23 +02:00
Laurent Destailleur
ca3cf1de9f NEW Add " as enclusore by default for CSV export. Keep removing CR/LF. 
Fix export of invoice.
 2022-07-10 02:25:46 +02:00
Laurent Destailleur
c77632ced8 Fix export invoice and lines. Pb in field order. Missing thirdparty type 2022-07-10 01:40:39 +02:00
Laurent Destailleur
547a7cdea2 Fix trans 2022-07-10 01:18:06 +02:00
Laurent Destailleur
25857c4cf2 FIX css on title of extrafield dates 2022-07-09 14:49:35 +02:00
Laurent Destailleur
77e0ca72fe Prepare edition of css for extrafields 2022-07-09 14:39:20 +02:00
Laurent Destailleur
697b7d812c FIX css in search of extrafields 2022-07-09 12:57:52 +02:00
Laurent Destailleur
4fdcb43d9c NEW Add extrafield type "IP" to store IP addresses 2022-07-09 12:56:38 +02:00