Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,756 Commits 36 Branches 189 Tags
49faedae6fef9775b889a063921ee252aa06ffad
Commit Graph

369 Commits

Author SHA1 Message Date
Laurent Destailleur
3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/element.php
	htdocs/projet/tasks.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/note.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2021-03-20 12:42:46 +01:00
Florian HENRY
df4a243f18 fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature 2021-03-18 17:13:34 +01:00
Laurent Destailleur
9480e15755 Merge pull request #16703 from dolibit-ut/patch-84 
Update card.php
 2021-03-16 10:37:07 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
UT from dolibit
9eb87ab43a Update card.php 
$help_url  add  ->  DE:Modul_Angebot
 2021-03-15 19:28:48 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Laurent Destailleur
1756d2833c Merge pull request #16513 from AlexisLaurier/develop 
Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
 2021-03-02 19:15:22 +01:00
Alexis LAURIER
516e7a3955 Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop 2021-03-02 16:04:37 +01:00
Alexis LAURIER
e219972936 avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED 2021-03-02 16:04:26 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
acb7b30eb0 Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
5d6ada77ca Fix test 2021-03-02 02:42:04 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Laurent Destailleur
f1f950e8b7 Close #16395 - Can filter on proposal source in list 2021-03-02 00:11:15 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
5931051c88 code syntax comm directory 2021-02-23 18:59:19 +01:00
Frédéric FRANCE
aecb185c8d Update card.php 2021-02-09 18:07:58 +01:00
Frédéric FRANCE
075d2c3ded remove deprecated 2021-02-09 17:58:59 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Anthony Berton
bb1af10cf1 warehouse thirparty affect on proposal or order 2021-01-17 16:48:51 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
dc9cd28437 Look and feel v14 2021-01-15 13:14:21 +01:00
Laurent Destailleur
de9835ae47 Merge pull request #15936 from bb2a/warhouse_in_propal 
NEW Can ask the warehouse in proposal
 2021-01-11 16:23:15 +01:00
Laurent Destailleur
c4de93fbb7 Update card.php 2021-01-11 16:21:15 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
f3e28c2dd0 FIX GETPOST of qty with wrong parameters 2021-01-11 13:00:29 +01:00
stickler-ci
55e6010d85 Fixing style errors. 2021-01-10 00:15:00 +00:00
Anthony Berton
d3fa8b9f20 20210110 2021-01-10 01:07:27 +01:00
Anthony Berton
8eaf7b3a3f 1 2021-01-09 17:36:14 +01:00
Anthony Berton
5effd4e897 20210109 2021-01-09 02:45:46 +01:00
Laurent Destailleur
8c3e7b4dc6 Fix vardump 2021-01-07 12:43:15 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
a6eb14f68b Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +01:00
Florian HENRY
2a2b372ba9 fix: manage price min for PRICE PER CUSTOMER 2020-12-10 15:08:36 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +01:00
Laurent Destailleur
2989ff50fa Fix syntax error 2020-11-28 13:52:52 +01:00
stickler-ci
aaf8d43780 Fixing style errors. 2020-11-27 13:33:37 +00:00
iouston
59c40227ff Add PROPAL_ENABLE_NEGATIVE 
in the case of a call for tenders it is possible to have to figure in less value with quotations whose total is negative
 2020-11-27 14:31:14 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00