lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,748 Commits 43 Branches 150 Tags 886 MiB
7909055ee8
Commit Graph

73593 Commits

Author SHA1 Message Date
josemariagomezroncero
0d49211dea
Correction for Hook for dynamic price 
Correction for Hook for dynamic price
 2020-02-13 12:59:59 +01:00
Laurent Destailleur
82535291c0
Merge pull request #13103 from ATM-Marc/FIX_11.0_situation_excess_recieved 
FIX: situation invoices: can't convert excess received to discount & bad previous payment amount
 2020-02-13 12:42:22 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3 Fix var not initialized 2020-02-13 12:33:34 +01:00
Laurent Destailleur
4f1c8e7f53 FIX #10203 2020-02-13 12:18:26 +01:00
Marc de Lima Lucio
fa78af1996 Merge branch 'FIX_8.0_situation_excess_paid' of github.com:ATM-Marc/dolibarr into 11.0 2020-02-13 12:18:16 +01:00
Laurent Destailleur
9e165a782f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:58:23 +01:00
Laurent Destailleur
45ed02ec13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-13 11:57:26 +01:00
Laurent Destailleur
c2ef63f35c NEW Close #13011 Add button create thirdparty when creating intervention 2020-02-13 11:57:13 +01:00
Laurent Destailleur
e511deb8e7 FIX #13096 2020-02-13 11:39:08 +01:00
Laurent Destailleur
78d4978d31 FIX #13100 2020-02-13 11:26:11 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging 
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
 2020-02-13 10:50:56 +01:00
Scrutinizer Auto-Fixer
17010478ba Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 09:44:08 +00:00
Laurent Destailleur
33b7fc11f0 Fix status of emailing target 2020-02-13 10:41:53 +01:00
Laurent Destailleur
495b3d54f1 Fix status of emailing target 2020-02-13 10:41:31 +01:00
Laurent Destailleur
1973f2c9b9 Fix look and feel v11 2020-02-13 10:07:34 +01:00
Laurent Destailleur
21d9b00fce Fix missing amount in table of prelevement 2020-02-13 00:05:01 +01:00
Laurent Destailleur
9667482ef2 Doc 2020-02-13 00:04:17 +01:00
Laurent Destailleur
138cf649df Fix missing amount in table of prelevement 2020-02-12 23:17:46 +01:00
Laurent Destailleur
4762bafb02 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/mrp/class/mo.class.php
 2020-02-12 22:58:37 +01:00
Laurent Destailleur
ccced09113 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/propal/list.php
	htdocs/core/class/html.formmail.class.php
 2020-02-12 22:54:55 +01:00
Laurent Destailleur
5be0485917 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-12 22:51:05 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
Laurent Destailleur
9f3bedb7ea Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 22:45:39 +01:00
Laurent Destailleur
139dfc3022 Debug MRP module 2020-02-12 22:45:27 +01:00
Laurent Destailleur
2ce0aa87e6 Responsive 2020-02-12 22:10:26 +01:00
Laurent Destailleur
bf2051ff80 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 22:03:01 +01:00
Laurent Destailleur
4981da235c Fix phpcs 2020-02-12 22:00:44 +01:00
Laurent Destailleur
e69b362fb5
Merge pull request #13079 from RubenRuCh/11.0 
FIX: #13038 ExpenseReport PDF - custom category description is not correct
 2020-02-12 21:59:23 +01:00
stickler-ci
f8eaca24af Fixing style errors. 2020-02-12 20:54:56 +00:00
Laurent Destailleur
c31fcb3981
Merge branch 'develop' into patch-30 2020-02-12 21:53:02 +01:00
Laurent Destailleur
0d366c45e5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 21:43:44 +01:00
Laurent Destailleur
6be746e219 Fix replenishment for virtual stock check if module is on or off 2020-02-12 21:42:48 +01:00
Laurent Destailleur
cfd64c7171 Fix class not found 2020-02-12 21:31:49 +01:00
josemariagomezroncero
373a5ff508
Hook for dynamic price 
Hook for dynamic price
 2020-02-12 21:31:45 +01:00
Laurent Destailleur
0f12003782 Trans 2020-02-12 21:20:55 +01:00
Laurent Destailleur
75774ec6c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Laurent Destailleur
83b5fe3c71 FIX #13077 Replace left join with inner join (left join was useless) 2020-02-12 20:24:58 +01:00
Laurent Destailleur
3f4c787c84 Fix physical stock were truncated in product/reassort page 2020-02-12 20:22:53 +01:00
Laurent Destailleur
18f0a0f73e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-12 19:36:43 +01:00
Laurent Destailleur
d419315e98 FIX #13048 2020-02-12 19:36:29 +01:00
Laurent Destailleur
d70712fd61
Merge pull request #13089 from mapiolca/patch-31 
Fix the display of the banner with multicompany
 2020-02-12 18:51:08 +01:00
Laurent Destailleur
50f0b61f1e
Update bankjournal.php 2020-02-12 18:50:33 +01:00
Laurent Destailleur
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4 
Show extrafields only when enabled
 2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14 
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
 2020-02-12 18:46:08 +01:00
Laurent Destailleur
08bd69d577
Merge pull request #13082 from oscim/patch-20 
report and apply GETPOST method
 2020-02-12 18:43:59 +01:00
Laurent Destailleur
ccb895e251
Merge pull request #13083 from atm-greg/FIX_bookkeeping_LD_Compta_Export 
fix missing fields in LD Compta Export
 2020-02-12 18:41:34 +01:00
Laurent Destailleur
3a9125b097
Merge pull request #13087 from ptibogxiv/patch-304 
Fix netmeasure update and display
 2020-02-12 18:35:44 +01:00
Laurent Destailleur
bd0666bf53
Update product.lib.php 2020-02-12 18:35:15 +01:00
Thomas
9b0b5f755b Fixed missing trigger on contact delete 2020-02-12 18:24:37 +01:00
Laurent Destailleur
75fe2f4dfc
Merge pull request #13092 from perotom/patch-1 
FIX: missing trigger on contact delete
 2020-02-12 18:23:46 +01:00
Laurent Destailleur
e9688e66c0
Merge pull request #13084 from atm-john/11.0_fix_retained_warranty_hasdelay 
FIX - hasDelay for retained warranty
 2020-02-12 18:22:53 +01:00
Laurent Destailleur
03a8414ba8 FIX #13085 2020-02-12 18:21:45 +01:00
Laurent Destailleur
e74df397eb FIX #13094 2020-02-12 17:28:18 +01:00
Laurent Destailleur
66493672eb Clean code 2020-02-12 15:20:37 +01:00
Laurent Destailleur
2dafbe0f91 Fix labels 2020-02-12 15:19:42 +01:00
Thomas
30c49478d8
Fixed missing trigger on contact delete 2020-02-12 13:50:58 +01:00
Marc de Lima Lucio
b1b00450a9 FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one 2020-02-12 12:10:48 +01:00
Marc de Lima Lucio
de8660fb55 FIX: situation invoice: allow excess paid to be converted to discount 2020-02-12 12:09:03 +01:00
Pierre Ardoin
c7181830fc
Fix the display of the banner with multicompany 
Before : if a account of a entity require to define the Journal code, Banner displayed in all entities.

Now : Show the banner only in the entity concerned.
 2020-02-12 09:11:39 +01:00
ptibogxiv
f17c7f4cb3
fix for unit with rowid (netmeasure) 2020-02-11 20:21:53 +01:00
ptibogxiv
558ccdd8b9
Update card.php 2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display 
nb: netmeasure is for real weight, volume or piece;

 i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
 2020-02-11 20:11:37 +01:00
Laurent Destailleur
92dc43de93 Fix phpcs 2020-02-11 19:37:24 +01:00
Laurent Destailleur
cc6313cdf3 Fix import examples 2020-02-11 19:32:27 +01:00
Laurent Destailleur
7f146111d2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-11 19:20:46 +01:00
Laurent Destailleur
2afe86a1d6 Fix look and feel v11 2020-02-11 19:19:13 +01:00
Laurent Destailleur
aa9ffbba05 Fix missing fields property 2020-02-11 19:18:36 +01:00
Laurent Destailleur
d2bafe3052 Add tab with stock movements 2020-02-11 18:18:04 +01:00
Laurent Destailleur
c6f46e0aec Fix look and feel v11 2020-02-11 17:20:12 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
Laurent Destailleur
bf49e5cee1 Show tab of stock movement of MO 2020-02-11 17:12:22 +01:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
3c865cbf72 Fix button cancel and re-open 2020-02-11 16:51:38 +01:00
Laurent Destailleur
9f5f460ae2 Fix field def 2020-02-11 16:42:48 +01:00
stickler-ci
fc170c1081 Fixing style errors. 2020-02-11 15:20:46 +00:00
Laurent Destailleur
8518e0752f NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page 2020-02-11 16:01:32 +01:00
atm-greg
66f6d1bfd4 add missing fields 2020-02-11 15:57:49 +01:00
stickler-ci
416cb3016d Fixing style errors. 2020-02-11 13:15:23 +00:00
oscim
8b67793409
report and apply GETPOST method 
report and apply GETPOST method  for $dateech, $dateperiod, $label
 2020-02-11 14:13:08 +01:00
Laurent Destailleur
03ee488d5f Fix look and feel v11 2020-02-11 10:41:50 +01:00
Laurent Destailleur
34cfa0c6af Fix look and feel v11 2020-02-11 10:40:14 +01:00
Laurent Destailleur
05f0242198 NEW The info_admin() can show text after click on other text 2020-02-11 10:38:09 +01:00
Anthony Berton
6b6355f373
Update html.form.class.php 2020-02-11 09:57:52 +01:00
Ruger
8d9de521f3 FIX: #13038 ExpenseReport PDF - custom category description is not correct 2020-02-11 09:13:15 +01:00
Laurent Destailleur
7878fe49df Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-10 21:29:05 +01:00
Laurent Destailleur
ee7aa14247 Fix color of status 2020-02-10 21:28:49 +01:00
Laurent Destailleur
5823e2f5ef add warning 2020-02-10 20:57:55 +01:00
Pierre Ardoin
fab8536f05
add project ref and title 2020-02-10 17:02:10 +01:00
Pierre Ardoin
f9b03596f6
Add project ref and title 2020-02-10 17:01:21 +01:00
Pierre Ardoin
573d86c725
Add project's ref and Title 2020-02-10 16:57:59 +01:00
Pierre Ardoin
546e7b1bcf
Add project Ref and Title 2020-02-10 16:57:02 +01:00
Pierre Ardoin
f279b4138b
Add Project Ref and Title 2020-02-10 16:52:41 +01:00
Alexandre SPANGARO
c77169ad87 FIX : Problem with column label in subscription list 2020-02-10 16:01:09 +01:00
Laurent Destailleur
cab228ebbe Fix condition 2020-02-10 15:54:46 +01:00
Laurent Destailleur
bb40dbe1c3 Fix label of field 2020-02-10 15:53:28 +01:00
Laurent Destailleur
c22bc04608
Merge pull request #13075 from defrance/patch-146 
NEW : Add "finished" field on product list
 2020-02-10 15:40:29 +01:00
Laurent Destailleur
82f5482e25
Merge pull request #13071 from aspangaro/12.0_a13 
NEW: Add accountancy code of thirdparty in supplier export
 2020-02-10 15:40:09 +01:00
Laurent Destailleur
4973f49113
Merge pull request #13070 from aspangaro/12.0_a12 
NEW: Add accountancy code of thirdparty in contact export
 2020-02-10 15:38:45 +01:00
Laurent Destailleur
453315bc63
Merge pull request #13073 from RubenRuCh/11.0 
FIX: #13018 Extrafields Supplier invoice
 2020-02-10 15:38:17 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop 
Add time tags to Receipt Printers module
 2020-02-10 15:37:37 +01:00
Laurent Destailleur
3792b8c8c8 Fix quote pb reported by travis CI 2020-02-10 15:34:57 +01:00
Laurent Destailleur
9aaed92b49 Fix quotes 2020-02-10 15:33:59 +01:00
Laurent Destailleur
9797fab012
Merge pull request #13069 from aspangaro/12.0_a11 
NEW : Add French farm chart of accounts 2014
 2020-02-10 15:32:59 +01:00
BENKE Charlene
40ac2d5cbd
Add finished field on list 2020-02-10 14:34:00 +01:00
Laurent Destailleur
644b27bcf9 Fix look and feel v11 2020-02-10 13:34:09 +01:00
Laurent Destailleur
b9a8d82b2f FIX Filter on list of events were lost after "Back to list" 2020-02-10 13:29:26 +01:00
simicar29
8bce409db0
Show extrafields only when enabled 
Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
 2020-02-10 13:14:42 +01:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
Laurent Destailleur
342d55a7db Test 2020-02-10 11:50:37 +01:00
AdrianDominik
5432ab3b05 FIX: #13018 Extrafields Supplier invoice 2020-02-10 11:18:59 +01:00
Pierre Ardoin
6de3795648 change translation Ref 
ProjectRef -> RefProject
 2020-02-10 09:10:45 +01:00
Pierre Ardoin
d74e1d9182 Update pdf_crabe.modules.php 2020-02-10 09:07:26 +01:00
stickler-ci
5022e58b95 Fixing style errors. 2020-02-10 08:04:40 +00:00
Pierre Ardoin
bd00803090 Update pdf_crabe.modules.php 2020-02-10 09:03:00 +01:00
stickler-ci
6ffbab0a63 Fixing style errors. 2020-02-10 08:01:40 +00:00
Pierre Ardoin
815206cb15 Add Project Title in header of pdf 
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
 2020-02-10 08:59:22 +01:00
Alexandre SPANGARO
20f9154cf3 NEW: Add accountancy code of thirdparty in supplier export 2020-02-10 06:24:13 +01:00
Alexandre SPANGARO
d28f110100 NEW: Add accountancy code of thirdparty in contact export 2020-02-10 06:06:27 +01:00
Alexandre SPANGARO
45711bb43c typo 2020-02-10 05:39:49 +01:00
Alexandre SPANGARO
2f2a2aa52a NEW : Add French farm chart of accounts 2014 2020-02-10 05:35:16 +01:00
Laurent Destailleur
058524ff82 Comment 2020-02-10 02:29:09 +01:00
Laurent Destailleur
3baf0e66b9 Trans 2020-02-10 01:11:52 +01:00
Laurent Destailleur
ecb1f1f2d7 Responsive 2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb Responsive 2020-02-10 00:47:44 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
07fbaa02d1 FIX #13050 2020-02-09 19:36:12 +01:00
Laurent Destailleur
d49943ab37 FIX #13019 2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single . 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-09 16:38:19 +01:00
Laurent Destailleur
53f740c60e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-09 16:37:19 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f FIX Mail smtps truncated if content has a line with single . 2020-02-09 15:51:43 +01:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
andreubisquerra
37e815183e
Add time tags 2020-02-09 14:06:02 +01:00
andreubisquerra
bc8d9e6c7e
Add langs tags 2020-02-09 14:04:22 +01:00
Laurent Destailleur
6daa10b499 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-08 19:10:52 +01:00
Laurent Destailleur
c2830f9e79 FIX Look and feel v11 2020-02-08 18:18:41 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
1ee959a11f Generic graph 2020-02-08 17:46:41 +01:00
Laurent Destailleur
33addfab01 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:21:17 +01:00
Laurent Destailleur
3852ba0655 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:16:25 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering 
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
 2020-02-08 17:16:01 +01:00
Laurent Destailleur
aed3ea25cb Code comment 2020-02-08 17:14:04 +01:00
Laurent Destailleur
3dfe7161cf Merge pull request #13035 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2020-02-08 17:09:25 +01:00
Laurent Destailleur
59e0ab9e04 Fix AT-BASE 2020-02-08 17:08:45 +01:00
Laurent Destailleur
4599c5557d
Merge pull request #13066 from homer8173/patch-18 
accounting austrian
 2020-02-08 16:28:47 +01:00
Laurent Destailleur
665876ffa4
Merge pull request #13061 from andreubisquerra/develop 
Add and finish receipt printer tags
 2020-02-08 16:19:44 +01:00
pnueda
c083458adf Update html.formfile.class.php 
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
 2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1
Merge pull request #13060 from pnueda/patch-1 
Update html.formfile.class.php
 2020-02-08 16:18:17 +01:00
Laurent Destailleur
102428a503 Merge pull request #13056 from atm-lena/FIX_cabyprodlist_filter 
FIX CA by prod list filter
 2020-02-08 16:09:18 +01:00
Laurent Destailleur
5fccbcc469
Merge pull request #13054 from hregis/10.0_mc 
FIX missing hook parameter
 2020-02-08 16:08:13 +01:00
Laurent Destailleur
8bcff9a0f1
Merge pull request #13052 from fappels/11_fix_expedition_ceate_line 
FIX expedition ceate line new parameter is not required.
 2020-02-08 16:07:36 +01:00
Laurent Destailleur
ee29c3efdd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 16:02:23 +01:00
Laurent Destailleur
5f507b2df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-02-08 15:42:35 +01:00
Laurent Destailleur
b01e1e7724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php 
Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 15:12:55 +01:00
Laurent Destailleur
10790420ba
Merge pull request #13051 from oscim/patch-19 
report and apply  GETPOST method for $datev and $datep
 2020-02-08 15:07:18 +01:00
Laurent Destailleur
544e05a7dd
Update card.php 2020-02-08 15:06:45 +01:00
Laurent Destailleur
34192f25f6 Merge pull request #13042 from ksar-ksar/11.0 
FIX : Update export_files.php
 2020-02-08 15:05:26 +01:00
ksar
e951743077 Update export_files.php 
Remove Warning
 2020-02-08 15:04:27 +01:00
Laurent Destailleur
f28da6a602 Merge pull request #13041 from ksar-ksar/develop 
FIX : Warning on admin/export_files
 2020-02-08 15:01:30 +01:00
Laurent Destailleur
5fac824824
Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing 
FIX advanced target emailing sql and ergonomy
 2020-02-08 14:59:00 +01:00
ptibogxiv
8100708639 Update pdf_espadon.modules.php 2020-02-08 14:57:04 +01:00
ptibogxiv
ae5da164c6 FIX need weight short label in shipping doc 
need short label because value + term is too long
 2020-02-08 14:56:36 +01:00
Laurent Destailleur
b66c2a29a2 Merge branch 'develop' into patch-301 2020-02-08 14:54:23 +01:00
Laurent Destailleur
46e7f613fd
Merge pull request #13049 from hregis/11.0 
FIX #13028
 2020-02-08 14:52:57 +01:00
Laurent Destailleur
85c4013a0d Update card.php 2020-02-08 14:52:02 +01:00
Laurent Destailleur
9c12c4be08 Fix customreports 2020-02-08 14:49:26 +01:00
Laurent Destailleur
3a74c3d7e9 Enhance property ->ismulticompanymanaged to define an object with entity 
on its parent.
 2020-02-08 14:40:30 +01:00
Laurent Destailleur
c3beb854a2 Definition of $fields for member and subscriptions 2020-02-08 13:44:31 +01:00
Laurent Destailleur
5f75ae4830 FIX If we can change vendor status, we must be able to chane vendor code 2020-02-08 11:34:57 +01:00
Laurent Destailleur
56079f928f Label of field 2020-02-08 11:34:25 +01:00
Laurent Destailleur
cffc56b80b Declaration of property fields of thirdparties 2020-02-08 11:32:38 +01:00
Laurent Destailleur
02a96e163f FIX If we can change vendor status, we must be able to chane vendor code 2020-02-08 11:26:16 +01:00
Norbert Penel
c29a7527ad accounting austrian 2020-02-08 10:19:38 +01:00
andreubisquerra
1e5940fbf0
Fix travis errors 2020-02-07 19:25:28 +01:00
andreubisquerra
ae06151146
Add and finish receipt printer tags 2020-02-07 18:34:58 +01:00
andreubisquerra
c52e26991a
Add receipt tags to lang 2020-02-07 18:32:08 +01:00
pnueda
8eb9c10788
Update html.formfile.class.php 
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
 2020-02-07 18:01:14 +01:00
Laurent Destailleur
9f9002d6a6 Update field definition 2020-02-07 16:05:04 +01:00
Laurent Destailleur
f114ca9479 Missing column import_key on ticket table 2020-02-07 15:53:50 +01:00
Laurent Destailleur
fe7b79c83c Fix definition of objects 2020-02-07 15:51:14 +01:00
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
Laurent Destailleur
9fdef6858b Remove code using a no more used field 2020-02-07 13:37:37 +01:00
Laurent Destailleur
4e4fd4c76c Remove code using a no more used field 2020-02-07 13:15:51 +01:00
Laurent Destailleur
0f1a8a3997 Implement min and max for generic graph 2020-02-07 13:01:07 +01:00
Laurent Destailleur
d9fda71a23 Fix phpcs 2020-02-07 12:51:08 +01:00
Laurent Destailleur
cd58822d98 Can edit a table of resolution code for tickets 2020-02-07 12:48:41 +01:00
Laurent Destailleur
2eae9a2fa2 FIX Missing include 2020-02-07 12:15:20 +01:00
Laurent Destailleur
84c1228ad4 FIX Disable ticket status change if ticket close 
FIX Use ref into label of ticket message
 2020-02-07 12:15:15 +01:00
Laurent Destailleur
11c6447096 Generic report 2020-02-07 12:13:55 +01:00