Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
98,974 Commits 36 Branches 189 Tags
0c8b74b54cd4817002697cb15e5475e74bc505d9
Commit Graph

3518 Commits

Author SHA1 Message Date
Florian Mortgat
ff3707b650 FIX: warning when adding a line if $remise_percent is an empty string 2021-02-08 17:24:40 +01:00
Laurent Destailleur
f0e1c02caa Look and feel v14 - Use placeholder on combolists 2021-02-06 00:05:24 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
 2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb FIX Must not be able to edit vat of all lines if not draft 2021-02-02 16:12:03 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
6fae2cfebe Merge branch '13.0' of https://github.com/dolibarr/dolibarr into develop 2021-01-28 00:29:16 +01:00
Laurent Destailleur
79c68c6132 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/commande/stats/index.php
 2021-01-28 00:23:44 +01:00
Laurent Destailleur
2be157c91f Trans 2021-01-28 00:18:11 +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
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
bcfe03216a FIX error managent and db transaction balance 2021-01-14 19:15:54 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Laurent Destailleur
bad4b14ba5 Fix properties 2021-01-12 10:34:15 +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
e3a1cabd87 Merge pull request #15942 from bb2a/add_alias_on_lists 
NEW Add column "alias" of company in list of proposal, order, invoice
 2021-01-11 15:56:22 +01:00
Laurent Destailleur
5bd59cd6d1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +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
Anthony Berton
d6072bae2b Update list.php 2021-01-10 22:21:18 +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
bbae40eeea Update card.php 2021-01-09 17:39:26 +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
26fa8b45ac Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Florian HENRY
7e34d9e6f9 Merge branch '13_backport' into dev_add_column_propal_order 2021-01-05 23:00:58 +01:00
Florian HENRY
296c998a36 enabled 2021-01-05 23:00:35 +01:00
Florian HENRY
6e7172887a Merge branch '13_backport' into dev_add_column_propal_order 2021-01-05 22:58:00 +01:00
Florian HENRY
510c619c85 space 2021-01-05 22:56:55 +01:00
Florian HENRY
b9bb48a01f better place and noadmininfo 2021-01-05 22:50:54 +01:00
Florian HENRY
939fecc611 add column payment mode terms shipping on order list 2021-01-05 20:32:29 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
5e92ed0dcd Fix load lang 2021-01-05 10:44:28 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
150b338764 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +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
Laurent Destailleur
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00