Commit Graph

93624 Commits

Author SHA1 Message Date
stickler-ci
e012ce242d Fixing style errors. 2021-01-11 16:17:43 +00:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
2021-01-11 17:10:03 +01:00
Laurent Destailleur
238fd5accb
Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists
NEW Can filter on extrafields date on lists
2021-01-11 16:41:01 +01:00
Laurent Destailleur
307d718e82
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow
NEW : Workflow to set a shipment as closed
2021-01-11 16:34:26 +01:00
stickler-ci
f5fa7928ca Fixing style errors. 2021-01-11 15:29:33 +00:00
Laurent Destailleur
5ee97dfd4a
Update mod_barcode_product_standard.php 2021-01-11 16:27:37 +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
9962c182c4
Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
2021-01-11 16:15:45 +01:00
Laurent Destailleur
9a5ae77615
Merge pull request #15926 from FHenry/develop
fix : remove php warning on install pages
2021-01-11 16:04:04 +01:00
Laurent Destailleur
8831c05d3e
Merge pull request #15924 from andreubisquerra/master
Improve free zone saving in TakePOS
2021-01-11 16:02:28 +01:00
Laurent Destailleur
f9c6d512cf
Merge pull request #15927 from frederic34/patch-8
code syntax
2021-01-11 16:00:34 +01:00
Laurent Destailleur
697c8a9b1c
Merge pull request #15930 from dolibit-ut/patch-62
Update ChangeLog
2021-01-11 15:59:12 +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
e2598f5af3 NEW Add check to avoid invoice date in future 2021-01-11 15:34:25 +01:00
Laurent Destailleur
0c34543145 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 15:20:15 +01:00
Laurent Destailleur
d859072202 Fix GETPOST 2021-01-11 15:19:47 +01:00
Laurent Destailleur
4a919a8c6a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 15:16:33 +01:00
Laurent Destailleur
25a703526e Fix GETPOST 2021-01-11 15:16:01 +01:00
Laurent Destailleur
4d07e39067 NEW Show total of payment on payment confirm page 2021-01-11 15:10:12 +01:00
Laurent Destailleur
ed00f6bfb9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-11 13:46:50 +01:00
Laurent Destailleur
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +01:00
Laurent Destailleur
3a2230e41d Fix rounding 2021-01-11 13:43:33 +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
5660159a6d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bom/bom_card.php
2021-01-11 13:13:26 +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
445a751d6b Fix price2num 2021-01-11 13:08:02 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
788ef257a9 Fix GETPOST for qty 2021-01-11 13:02:05 +01:00
Laurent Destailleur
f3e28c2dd0 FIX GETPOST of qty with wrong parameters 2021-01-11 13:00:29 +01:00
Laurent Destailleur
7ba73f6c25 Fix price2num 2021-01-11 12:56:28 +01:00
Laurent Destailleur
fe7be8362f Fix td balance 2021-01-11 12:03:28 +01:00
Anthony Berton
59ea907b18 Update list.php 2021-01-10 22:47:30 +01:00
Anthony Berton
d6072bae2b Update list.php 2021-01-10 22:21:18 +01:00
Anthony Berton
b3dfe5d934 Update list.php 2021-01-10 21:48:49 +01:00
Anthony Berton
52c9dab72a Update list.php 2021-01-10 21:47:17 +01:00
Florian HENRY
c7cddb19be fix stickler 2021-01-10 11:58:22 +01:00
Florian HENRY
2a3a73c831 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-01-10 11:58:06 +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
Laurent Destailleur
53f09e31cc Update doc 2021-01-09 13:24:03 +01:00
Anthony Berton
5effd4e897 20210109 2021-01-09 02:45:46 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
2021-01-09 02:34:43 +01:00
Laurent Destailleur
b3461161ec Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH 2021-01-09 02:28:50 +01:00
zuiko
50461931b0
Update card.php
$type replaced by $fk_barcode_type in
$tmpcode = $modBarCodeProduct->getNextValue($object, $type);
in order to set it
2021-01-09 01:13:02 +01:00
zuiko
bcff65c3d3
Update mod_barcode_product_standard.php
get barcode type configuration for products only if $type not set
2021-01-09 01:01:14 +01:00