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
83,957 Commits 35 Branches 179 Tags 1.7 GiB
f12a1b2d0e
Commit Graph

9638 Commits

Author SHA1 Message Date
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Laurent Destailleur
6366881f91 FIX #13175 2020-02-24 00:41:25 +01:00
Laurent Destailleur
f931b92d36 Merge branch 'new-takepos-batch-decrement' of 
https://github.com/OPEN-DSI/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/errors.lang
 2020-02-23 22:49:03 +01:00
Laurent Destailleur
189c0d675b Fix memory report. Xdebug no more required. Try = null instead of unset. 2020-02-23 22:05:59 +01:00
Laurent Destailleur
0d474b2ec9 CSS 2020-02-22 14:20:42 +01:00
Laurent Destailleur
1d34ef213c Fix error management 2020-02-22 12:19:46 +01:00
Frédéric FRANCE
8d507c4f32 fix workflow with multicurrency 2020-02-21 18:12:48 +01:00
Laurent Destailleur
c0098188af
Merge pull request #13154 from frederic34/patch-7 
fix workflow with multicurrency
 2020-02-21 18:12:27 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
89b7c8dfd6 NEW Can select which element to export in export accounting documents. 2020-02-21 14:20:05 +01:00
VESSILLER
ec19b2feef FIX phpcs nestling too high level 2020-02-21 12:00:16 +01:00
VESSILLER
71c9b94b22 NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation 2020-02-21 11:08:34 +01:00
Frédéric FRANCE
3df3a2560c
fix workflow with multicurrency 2020-02-20 15:11:31 +01:00
Laurent Destailleur
52c7f908a0 Doxygen 2020-02-20 14:02:27 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
e73d83767c Fix phpcs 2020-02-20 12:35:48 +01:00
Laurent Destailleur
7796724d63
Update list.php 2020-02-20 01:07:41 +01:00
Laurent Destailleur
960302c012
Merge branch 'develop' into patch-35 2020-02-20 01:07:08 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
44c2909696 FIX Multicompany compatibility 2020-02-19 16:08:33 +01:00
Laurent Destailleur
3fafbb372b Remove call of $mc->dao than hangs. Replaced with $mc use. 2020-02-19 15:51:27 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Pierre Ardoin
bebc37abe3
Update list.php 2020-02-19 08:54:10 +01:00
Pierre Ardoin
34d7fb887f
Show project Ref support if enable 
Add search and Project Ref column in the list, only if project module is enable.
 2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a FIX #13118 2020-02-19 03:37:28 +01:00
Laurent Destailleur
43b173ef76 FIX #13131 2020-02-19 01:23:54 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Laurent Destailleur
c196342fd8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-13 15:44:06 +01:00
Laurent Destailleur
ec30938a07 Fix phpcs 2020-02-13 15:43:53 +01:00
Laurent Destailleur
306b8d190f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 15:42:54 +01:00
Laurent Destailleur
c6c941e09a Fix phpcs 2020-02-13 15:42:41 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Marc de Lima Lucio
fa78af1996 Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0 2020-02-13 12:18:16 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
e511deb8e7 FIX #13096 2020-02-13 11:39:08 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
Laurent Destailleur
75774ec6c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Marc de Lima Lucio
b1b00450a9 FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one 2020-02-12 12:10:48 +01:00
Marc de Lima Lucio
de8660fb55 FIX: situation invoice: allow excess paid to be converted to discount 2020-02-12 12:09:03 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
stickler-ci
416cb3016d Fixing style errors. 2020-02-11 13:15:23 +00:00
oscim
8b67793409
report and apply GETPOST method 
report and apply GETPOST method  for $dateech, $dateperiod, $label
 2020-02-11 14:13:08 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
5f507b2df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 16:01:41 +01:00