Commit Graph

73492 Commits

Author SHA1 Message Date
Laurent Destailleur
aa574c2a47
Merge pull request #10517 from frederic34/patch-18
fix phpcs
2019-02-08 09:56:50 +01:00
Laurent Destailleur
7334f02e5c
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
Dev defautselectcustomertype
2019-02-08 09:56:29 +01:00
Laurent Destailleur
81507ea43e
Merge pull request #10510 from frederic34/patch-2
fix phpcs public/payment/newpayment.php
2019-02-08 09:53:23 +01:00
Laurent Destailleur
4997b5968f
Merge pull request #10506 from ATM-Marc/FIX_7.0_parent_line
FIX: line edit template: keep fk_parent_line
2019-02-08 09:52:21 +01:00
Laurent Destailleur
714516fc18
Merge pull request #10509 from OPEN-DSI/fix-margin-agents
Fix margin by users when a thirdparty have many sellers
2019-02-08 09:51:26 +01:00
Laurent Destailleur
3f01cd554b
Update agentMargins.php 2019-02-08 09:50:45 +01:00
Laurent Destailleur
76b021d061
Merge pull request #10505 from ATM-Marc/FIX_7.0_expedition_status
FIX: expedition: reset status on rollback
2019-02-08 09:46:14 +01:00
Laurent Destailleur
92ef0d75cf
Merge pull request #10504 from atm-quentin/FIX_supplier_invoice_paiement_credit_deposit
FIX supplier invoice payment total doesnnt care about deposit or credit
2019-02-08 09:44:42 +01:00
Laurent Destailleur
ccda5719cf
Merge pull request #10503 from atm-quentin/FIX_product_stat_supplier_invoice
FIX supplier invoice product stats total ht is line total not invoice…
2019-02-08 09:43:38 +01:00
Laurent Destailleur
70135a1940
Merge pull request #10493 from grandoc/new_branch_04_02_2019
update with html5 compliant code
2019-02-08 09:42:29 +01:00
Laurent Destailleur
0e42e8824b
Merge branch 'develop' into new_branch_04_02_2019 2019-02-08 09:42:18 +01:00
Laurent Destailleur
471f11dace
Merge pull request #10502 from hregis/9.0_merge
FIX wrong merged conflict
2019-02-08 09:34:49 +01:00
Laurent Destailleur
8abebb091c Var no more used 2019-02-08 09:33:01 +01:00
Laurent Destailleur
24955088de
Merge pull request #10501 from hregis/8.0_mc
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-08 09:31:26 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
e5d7a862b4
Merge pull request #10527 from atm-ph/fix_8.0_psql_search_insensitive_accent
Fix psql search insensitive accent
2019-02-08 09:29:59 +01:00
Laurent Destailleur
9aa2911291
Merge pull request #10511 from frederic34/patch-17
.editorconfig for php psr2
2019-02-08 09:28:59 +01:00
Laurent Destailleur
bd3f0da19c
Merge pull request #10515 from atm-gauthier/8.0_fix_can_addline_on_invoices
FIX : can't add lines on invoices
2019-02-08 09:27:51 +01:00
Laurent Destailleur
0ac995b37c
Merge pull request #10512 from atm-florian/8.0
fix php warning
2019-02-08 09:27:18 +01:00
Laurent De Coninck
48eba7c71b use font awesome for the top menu icons 2019-02-08 08:41:26 +01:00
Laurent Destailleur
3bdf017d41 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-07 19:39:59 +01:00
Laurent Destailleur
8d82135033 Fix missing \n 2019-02-07 19:39:23 +01:00
Laurent Destailleur
491bfbdbfc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-07 19:39:04 +01:00
Laurent Destailleur
89af7b0e98 Add doctype to web site 2019-02-07 19:38:36 +01:00
atm-ph
51515a487e Fix search unaccent from left menu search box 2019-02-07 17:58:25 +01:00
atm-ph
ec7ef265b7 Fix psql search insensitive accent 2019-02-07 17:47:17 +01:00
atm-greg
9d0e0c2798 FIX add fk_unit on addline action 2019-02-07 15:17:52 +01:00
Laurent Destailleur
0156cd40a6 Fix name 2019-02-07 14:00:32 +01:00
Laurent Destailleur
065e74379b Missing picto 2019-02-07 13:54:38 +01:00
Laurent Destailleur
2ef8544a39 sort and filter on parent company 2019-02-07 13:52:51 +01:00
Laurent Destailleur
6a4a92510d Code comment 2019-02-07 13:32:05 +01:00
atm-ph
8e6a567b09 Fix display payment table on multiple pages 2019-02-07 12:36:22 +01:00
florian HENRY
bc74cd5066 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_defautselectcustomertype 2019-02-07 12:21:45 +01:00
florian HENRY
6ee5a9e2a6 fix travis 2019-02-07 12:21:33 +01:00
Alexandre SPANGARO
2ba8ae00e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
a28c926f03 Fix 2019-02-06 21:43:16 +01:00
Laurent Destailleur
5516cb061d Fix filter 2019-02-06 18:50:34 +01:00
Laurent Destailleur
d960159b73 NEW Column of parent company is available in list of third parties 2019-02-06 18:49:58 +01:00
Frédéric FRANCE
c0686733e8
fix phpcs 2019-02-06 15:56:13 +01:00
gauthier
29e4fce450 FIX : can't add lines on invoices 2019-02-06 12:35:23 +01:00
florian HENRY
f0f0b69d87 add comment 2019-02-06 10:59:24 +01:00
florian HENRY
3f6187fe12 remove useless parameters 2019-02-06 10:58:40 +01:00
florian HENRY
813a7a0085 remove comment 2019-02-06 10:57:11 +01:00
florian HENRY
3f20cae6d3 NEW: setup default thridparty type (customer or prospect/customer) 2019-02-06 10:54:11 +01:00
Lionel VESSILLER
b87df18292 Fix the margin rate by seller when the margin is negative 2019-02-06 09:37:19 +01:00
florian HENRY
95cc9faf7e fix php warning 2019-02-06 09:01:24 +01:00
Laurent Destailleur
58eaee2acf Fix css 2019-02-06 00:56:28 +01:00
Laurent Destailleur
9e28db4202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/export.php
2019-02-06 00:51:10 +01:00
Laurent Destailleur
88fb491441 Fix note output 2019-02-06 00:40:07 +01:00
Laurent Destailleur
58e6cfd635 Fix popup content 2019-02-06 00:36:11 +01:00