Commit Graph

8871 Commits

Author SHA1 Message Date
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Laurent Destailleur
9de0e69456 FIX column project into list 2019-05-10 15:11:06 +02:00
Laurent Destailleur
5625c94c44 Fix missing label on project tooltip 2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e Fix missing label on project tooltip 2019-05-10 14:39:05 +02:00
Laurent Destailleur
6cb96b926b Fix phpcs 2019-05-09 21:34:22 +02:00
Laurent Destailleur
78c4a3cced Fix lang 2019-05-09 18:33:50 +02:00
Laurent Destailleur
a94c291b76 Dolibarization 2019-05-09 16:59:06 +02:00
Laurent Destailleur
3bf162dcd6 Clean code for v10 2019-05-09 14:36:48 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
2019-05-08 19:14:31 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
ptibogxiv
c94e621059
FIX : facnumber to ref report takepos 2019-05-04 17:23:57 +02:00
Laurent Destailleur
64fb7bd1c2
Merge pull request #11103 from grandoc/new_branch_02_05_2019
inactive a var_dump
2019-05-03 02:29:25 +02:00
Philippe GRAND
bcd96ba8d6 inactive a var_dump 2019-05-02 14:42:02 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/website.inc.php
2019-05-02 14:41:56 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master
NEW Add history to view and print previous sales on TakePos.
2019-05-02 14:04:57 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
2136bce4b0 FIX missing situation invoice in list 2019-04-30 15:10:38 +02:00
andreubisquerra
00db274956 Add history to view and print previous sales. 2019-04-28 18:12:33 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
3b04d2fe9b Fix warnings 2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482 Fix warnings 2019-04-23 13:20:44 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
84ec39f043 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-23 12:25:53 +02:00
Laurent Destailleur
6da42941a8 NEW Add attached document on bank account visible in automatic ECM. 2019-04-21 19:54:30 +02:00
Laurent Destailleur
74ba9f57f1 Fix phpcs 2019-04-19 18:48:00 +02:00
John BOTELLA
0855d84ccf FIX error messages not displayed 2019-04-18 10:40:34 +02:00
atm-quentin
cb7f9c2b6f NEW filter by thirdparty on report CA by prod/serv 2019-04-17 14:35:46 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
Laurent Destailleur
212b058f46 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-17 01:18:46 +02:00
Laurent Destailleur
8310e09786 Fix td balance 2019-04-17 01:18:02 +02:00
Philippe GRAND
728381e6e6 FIX : bug #11018 2019-04-15 15:10:44 +02:00
Laurent Destailleur
76567b1d07 NEW Can filter on the date of period for social contributions 2019-04-12 12:51:48 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
8079a389f8
Merge pull request #10992 from altatof/faccard2
NEW : retrieve invoice infos from order when billing shipment
2019-04-11 16:34:42 +02:00
Laurent Destailleur
f2fd07d824
Merge pull request #10991 from altatof/faccard
NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
2019-04-11 16:31:37 +02:00
Laurent Destailleur
4f87018c33
Update card.php 2019-04-11 16:31:13 +02:00
Christophe Battarel
46e398f3d3 NEW : retrieve invoice infos from order when billing shipment 2019-04-10 10:50:01 +02:00
Christophe Battarel
b04296984d NEW constant KEEP_DISCOUNT_LINES_FROM_ORIGIN 2019-04-10 10:29:17 +02:00
Christophe Battarel
5f9f615e11 fix form_conditions_reglement parameters 2019-04-09 18:37:36 +02:00
Christophe Battarel
790c5f493a fix select_conditions parameters 2019-04-09 18:32:00 +02:00
Christophe Battarel
01255602d8 fix select_conditions parameters 2019-04-09 18:30:58 +02:00
Christophe Battarel
5382ad207f NEW : add payment terms to invoices list 2019-04-09 18:26:00 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
1274d71a10 Fix phpcs 2019-04-08 16:00:01 +02:00
Laurent Destailleur
2047ad62c5
Merge pull request #10979 from fpeyraud/develop
Fix redirection on social tax deletion
2019-04-08 13:58:07 +02:00
Florent Peyraud
7672fd7cf0 Fix redirection on social tax deletion 2019-04-08 09:05:51 +02:00
Dan Rusu
4597e78a9d Re synchronized the UI action button "Mark as credit available" with API
At some point we will need to move this code into common location (maybe facture.class.php) and call as function from both places
2019-04-06 20:10:11 +03:00
Laurent Destailleur
bb9cd05ea8 Fix phpcs 2019-04-02 20:02:43 +02:00