Commit Graph

1963 Commits

Author SHA1 Message Date
Laurent Destailleur
5a471d38c2
Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign
New : add massActions "Validate" and "Sign"
2020-09-07 12:13:29 +02:00
Laurent Destailleur
570c72f6c9
Update list.php 2020-09-07 12:12:28 +02:00
Adrien Raze
c8c6be2038 Retours PR 2020-09-07 10:50:01 +02:00
stickler-ci
43590587e5 Fixing style errors. 2020-09-03 12:30:04 +00:00
Adrien Raze
bcd9a0b29f Retours PR 2020-09-03 14:25:17 +02:00
stickler-ci
8c514c8025 Fixing style errors. 2020-09-03 08:24:12 +00:00
Adrien Raze
c043501ee5 Retours PR standard 2020-09-03 10:19:57 +02:00
Adrien Raze
0898a1e28a Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign 2020-09-03 10:06:13 +02:00
Adrien Raze
675fe05808 Retours PR Standard 2020-09-03 09:51:49 +02:00
Laurent Destailleur
80f824569a Use english 2020-09-02 19:15:03 +02:00
Laurent Destailleur
a58dcc3886 Doc 2020-09-02 19:10:07 +02:00
Laurent Destailleur
a984c8e969 Use english 2020-09-02 18:57:56 +02:00
Laurent Destailleur
d913736bd1
Update list.php 2020-09-02 17:59:21 +02:00
Laurent Destailleur
ee003ed499
Update list.php 2020-09-02 17:57:09 +02:00
stickler-ci
a713286579 Fixing style errors. 2020-09-02 13:58:04 +00:00
Adrien Raze
d6113acfc8 action presign/prevalidate + action sign/validate + Traductions 2020-09-02 15:20:10 +02:00
Laurent Destailleur
1a353a5742
Merge pull request #14592 from TobiasSekan/UniformAvailabilityDescOnPropal
FIX Uniform availability delay description on commercial proposal (new and card)
2020-08-31 16:25:42 +02:00
Sekan, Tobias
070a09d5cc Uniform availability desc. on propal 2020-08-31 13:41:22 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
f997d11761
Update card.php 2020-08-27 21:02:01 +02:00
Laurent Destailleur
7730569dff
Update card.php 2020-08-27 21:00:01 +02:00
stickler-ci
a60968e95b Fixing style errors. 2020-08-24 14:17:15 +00:00
Christian Foellmann
0e9677fd34 allow default settings for "cond_reglement_id" and "mode_reglement_id"
(cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)
2020-08-24 16:08:44 +02:00
Laurent Destailleur
6ad18ceef0 Remove useless code 2020-08-21 19:48:31 +02:00
Laurent Destailleur
7217dc3114 Better perf for phpunit on very large databases 2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Laurent Destailleur
e455f8afa6
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
Fixed translation of product units in documents
2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
Tim Otte
c5816478d9 Added fetch_thirdparty (without the site crashes) 2020-07-28 11:14:55 +02:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
Abdessalam@MEGALOGI
1e6273b92d Update card.php
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
2020-07-18 23:11:17 +02:00
Laurent Destailleur
b6452dbbc0
Merge pull request #14196 from Tim-Otte/fix-proposals-urgent
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
2020-07-10 02:51:25 +02:00
Tim Otte
a73f77cfef Fixed same error like before 2020-07-07 12:43:15 +02:00
Laurent Destailleur
4fd970af28 Fix phpcs 2020-07-07 01:29:31 +02:00
Laurent Destailleur
14c98f277b NEW Can change VAT rate of all lines of a draft object in one step. 2020-07-06 22:48:22 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Tim Otte
bce0a93227 Hotfix for an error in v12 2020-07-03 00:33:54 +02:00
Regis Houssin
a5431a40da FIX missing possibility to change entity when propal cloning 2020-07-02 10:16:20 +02:00
Tim Otte
94a1d71fba Hotfix for an error in v12 2020-06-30 15:20:30 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
florian HENRY
d9e26b8569 fix template email on prpal list 2020-05-12 08:38:03 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
2020-05-11 19:43:06 +02:00