Commit Graph

93657 Commits

Author SHA1 Message Date
Laurent Destailleur
3054fb4cd6
Merge pull request #15959 from FHenry/dev_fix_contact_bulk
Dev fix contact bulk
2021-01-12 20:25:26 +01:00
Laurent Destailleur
fd35ef0a6f Fix travis 2021-01-12 10:45:15 +01:00
Laurent Destailleur
0d6ff51598 Move pgloader version 2021-01-12 10:40:53 +01:00
Laurent Destailleur
bad4b14ba5 Fix properties 2021-01-12 10:34:15 +01:00
Florian HENRY
98eff62aff Merge branch '13_backport' into dev_fix_contact_bulk 2021-01-12 10:25:18 +01:00
Florian HENRY
e34a797899 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport 2021-01-12 10:21:35 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Florian HENRY
2be924d5d8 fix js bulkemail 2021-01-12 10:01:32 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Florian HENRY
7f90c88d6a fix js syntax 2021-01-12 09:51:39 +01:00
Florian HENRY
a689d2898e Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-12 09:37:50 +01:00
Laurent Destailleur
db69707579 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 20:53:31 +01:00
Laurent Destailleur
6e860efa44 CSS 2021-01-11 20:53:18 +01:00
Florian HENRY
21e1d5c8c9 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab 2021-01-11 18:07:10 +01:00
Laurent Destailleur
0999bc74d2
Merge pull request #15948 from atm-kevin/NEW/Hook_on_customer_tab_to_add_shortlist
NEW Hook to allow external modules to add their own shortlist of recent objects
2021-01-11 17:50:34 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion
NEW : Add contact tag and bulk email status on thirparty+contact create form
2021-01-11 17:28:12 +01:00
kevin
5ff18baaa8 Add hook to allow external modules to add their own shortlist of recent objects 2021-01-11 17:13:07 +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
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
88fdf0491f
Merge pull request #15943 from aspangaro/13b6
FIX: Hidden accountancy export button without any right
2021-01-11 16:07:55 +01:00
Laurent Destailleur
f6de607889 Fix warning 2021-01-11 16:07:02 +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
507bb5b0d9
Merge pull request #15928 from fappels/13_fix_edit_expedition_field
Fix expedition class (tms cannot be null)
2021-01-11 16:01:19 +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
1b017a29ff
Merge pull request #15929 from indelog/13.0
Fix Debugbarr : TraceableDB::idate not compatible with DolDB::idate
2021-01-11 15:59:54 +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
d2c0dd35b0
Merge pull request #15937 from aspangaro/13b5
Various payment - Add Amount & direction in clone mode
2021-01-11 15:58:42 +01:00
Laurent Destailleur
d2c86578fa
Update card.php 2021-01-11 15:58:20 +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