lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

80319 Commits

Author SHA1 Message Date
Laurent Destailleur
20b6d3828e NEW Show image of user in the combo select of users 2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
dfb5c78a68 FIX bad concat when generating desription of event on email sent 2020-10-17 11:51:17 +02:00
Laurent Destailleur
3d215048d0 Update Stripe API use to 2020-08-27 2020-10-17 11:16:30 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
f737e01a31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-16 17:40:35 +02:00
Laurent Destailleur
4a3dc6ecb3 Fix syntax error 2020-10-16 17:40:19 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master 
Change the tag char for security reasons in 'Receipt Printer' module
 2020-10-16 17:20:04 +02:00
Laurent Destailleur
b69d178436
Merge pull request #15038 from aspangaro/13a25 
FIX Binding on expense report (Double rowid)
 2020-10-16 17:15:17 +02:00
Laurent Destailleur
52a5ac965b
Merge pull request #15042 from ndrosis/patch-27 
Add & Update tva for Greece
 2020-10-16 17:13:46 +02:00
Laurent Destailleur
27282d7e3d FIX Include the ticket and mo table in merge process of thirdparty 2020-10-16 17:08:23 +02:00
Laurent Destailleur
885e6caaa1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-10-16 15:53:31 +02:00
Laurent Destailleur
6bba249935 FIX pdf_getlinetotalwithtax must show total incl tax 2020-10-16 15:50:51 +02:00
Laurent Destailleur
e74b833d7f Look and feel v13 2020-10-16 15:40:52 +02:00
Laurent Destailleur
3e75cbbeb5 Fix for smartphone 2020-10-16 14:50:36 +02:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece 2020-10-16 15:20:12 +03:00
Laurent Destailleur
4dea8c4bb7 Fix missing token 2020-10-16 13:36:05 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Alexandre SPANGARO
67cf917f7b FIX Binding on expense report (Double rowid) 2020-10-16 11:57:36 +02:00
Laurent Destailleur
7a7e1ad7cf CSS 2020-10-16 00:29:35 +02:00
Laurent Destailleur
5905d3be64 Fix phpcs 2020-10-16 00:06:26 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-10-15 21:00:49 +02:00
Laurent Destailleur
cd9acd02a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-15 20:51:46 +02:00
Laurent Destailleur
9bbb471b4f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/loan/card.php
 2020-10-15 20:51:30 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-15 20:38:32 +02:00
Laurent Destailleur
a9a519e890
Merge pull request #15025 from fmarcet/10.0 
FIX: Unable to edit extrafields in expense report
 2020-10-15 20:30:14 +02:00
Laurent Destailleur
4eddcb7503
Merge pull request #15023 from Ahuahuachi/10.0 
FIX #14927 Change ContratLigne property type to product_type
 2020-10-15 20:29:38 +02:00
Laurent Destailleur
3d68ab4059
Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Laurent Destailleur
75290d1bd4
Update contrat.class.php 2020-10-15 20:26:12 +02:00
Laurent Destailleur
c3a02d0391
Update contrat.class.php 2020-10-15 20:24:26 +02:00
Laurent Destailleur
24f7a8aeed
Merge pull request #15028 from FHenry/fix_intracom 
fix table creation for intracom and change reserved name column name
 2020-10-15 20:19:05 +02:00
Laurent Destailleur
86887fc650
Update intracommreport.php 2020-10-15 20:18:00 +02:00
Laurent Destailleur
4c684536d1
Merge pull request #15031 from FHenry/dev_add_lateOutsatndingAmount_into_customer_tab 
NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
 2020-10-15 20:16:45 +02:00
Laurent Destailleur
2155c0123d
Merge pull request #15021 from Givriz/dev 
Fix : correction de commentaires
 2020-10-15 20:15:12 +02:00
Laurent Destailleur
14a26c499f
Merge pull request #15027 from ATM-Nicolas/fix_ecm_src_object_type 
FIX : Use table_element instead of element
 2020-10-15 20:14:39 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
stickler-ci
cd5201e40a Fixing style errors. 2020-10-15 10:24:00 +00:00
Florian HENRY
0cb04d14d7 NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late 2020-10-15 12:20:37 +02:00
Florian HENRY
a0d1e96bfd fix table creation for intracom and change reserved name column name 2020-10-15 11:37:44 +02:00
ATM-Nicolas
20aee01fd8 FIX : Use table_element instead of element 2020-10-15 11:14:20 +02:00
Laurent Destailleur
520645a02c Renamed all methods valide() into validate() 2020-10-15 10:15:37 +02:00
Ferran Marcet
32d823c739 FIX: Unable to edit extrafields in expense report 2020-10-15 09:40:50 +02:00
ATM john
b9cbd84d4e Fix page break 2020-10-15 09:30:48 +02:00
Florian HENRY
6a4e01de1d fix review 2020-10-15 08:36:04 +02:00
Florian HENRY
0597768ea8 fix review 2020-10-15 08:28:38 +02:00
Florian HENRY
109d1ab801 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-15 08:25:46 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type 
This bug is produced because the ContratLigne class gives a property type instead of a product_type
 2020-10-14 22:17:50 -05:00
bahfir abbes
db5292e647 new:handle new type reference in add and update actions 2020-10-15 01:19:05 +01:00
Laurent Destailleur
9cc8e6ac99 Fix intracommreport 2020-10-14 20:25:02 +02:00
Laurent Destailleur
0908ac5867 Fix phpcs 2020-10-14 20:18:07 +02:00
Laurent Destailleur
d283e8f649 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb Fix phpcs 2020-10-14 20:13:30 +02:00
Laurent Destailleur
20d5098ce2 Fix regression in dol_getdate() 2020-10-14 19:42:17 +02:00
Laurent Destailleur
bc1ad96ad1 FIX #14993 2020-10-14 19:28:59 +02:00
Laurent Destailleur
a8eeb7099a Fix style of online help when page available. 2020-10-14 19:01:37 +02:00
Laurent Destailleur
f4ef8a3285
Use class instead of hard coded style 2020-10-14 18:52:41 +02:00
Givriz
c50e288a07 Correction de commentaires 
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais).
 2020-10-14 18:26:05 +02:00
stickler-ci
05ac7c91c7 Fixing style errors. 2020-10-14 16:25:23 +00:00
Florian HENRY
174bc67744 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:23:11 +02:00
Florian HENRY
4fd32325d6 cast int 2020-10-14 18:22:55 +02:00
stickler-ci
ee631e629f Fixing style errors. 2020-10-14 16:22:11 +00:00
Florian HENRY
9c3988da5c add show empty 2020-10-14 18:19:41 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Florian HENRY
dfa2625de7 Merge branch 'dev_add_dict_NatureOfProductType' of github.com:FHenry/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:19 +02:00
Florian HENRY
50a9bd368c review 2020-10-14 18:15:48 +02:00
BENKE Charlene
1af3881796
If specific help present we change color of icon 2020-10-14 18:08:31 +02:00
Laurent Destailleur
bb367a4489
Update dict.php 2020-10-14 17:40:27 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147 
fix:allow const files loading from modules inside custom folders
 2020-10-14 17:39:08 +02:00
Laurent Destailleur
a2a6ddaa66
Merge pull request #15008 from TobiasSekan/SelectableColumnsOnSalesTaxesList 
NEW Selectable columns on sales tax list
 2020-10-14 17:37:23 +02:00
Laurent Destailleur
afc0460a7f
Merge pull request #15006 from davidNDU/clone/develop 
Model Builder template/class/myobject.class.php faulty SQL statement
 2020-10-14 17:36:13 +02:00
Laurent Destailleur
a0f7aad591
Merge pull request #15019 from ATM-Nicolas/new_ecm_src_object_fields 
NEW : Fill ECM src object fields in dol_add_file_process
 2020-10-14 17:35:29 +02:00
Laurent Destailleur
ba001803ed
Update files.lib.php 2020-10-14 17:35:14 +02:00
Laurent Destailleur
820bf5b393
Merge pull request #15011 from bafbes/abb120348 
fix:boolean values in showinputfield function are 1 and 0 not 'on' and 'off'
 2020-10-14 17:18:02 +02:00
Laurent Destailleur
ee19f3fc94
Update actions_addupdatedelete.inc.php 2020-10-14 17:16:35 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349 
fix:two fields with same ids
 2020-10-14 17:15:24 +02:00
Laurent Destailleur
57aabfb3c5
Merge pull request #15013 from FHenry/dev_objectrefferent_for_BOM 
NEW display stat for BOM on "object referent"/linked Object product tab
 2020-10-14 17:14:47 +02:00
Laurent Destailleur
e423bbf823 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 17:11:58 +02:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
ATM-Nicolas
98eb11be62 NEW : Fill ECM src object fields in dol_add_file_process 2020-10-14 16:59:05 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Laurent Destailleur
3cf2b6b5eb Doc comment. 2020-10-14 15:01:50 +02:00
Laurent Destailleur
fe19eea540
Merge pull request #15007 from hregis/develop_bug2 
FIX avoid spaces in file name
 2020-10-14 14:45:40 +02:00
Florian HENRY
90df353f0c fix number of lines 2020-10-14 14:30:07 +02:00
Florian HENRY
a2ef7bc61e add select 2020-10-14 14:26:40 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can 
decide if it is an internal or external (default) user.
 2020-10-14 14:02:07 +02:00
Florian HENRY
fdf81b2458 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 12:26:18 +02:00
Florian HENRY
2d1d76b5a3 add credentials 2020-10-14 12:26:10 +02:00
Florian HENRY
77de8c242c commit add table 2020-10-14 12:24:35 +02:00
Laurent Destailleur
02fcee5d94 Fix make the default sender email mandatory into setup (if not defined, 
no emails can be sent).
 2020-10-14 12:21:31 +02:00
Florian HENRY
ca37827e72 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 11:20:48 +02:00
Florian HENRY
14a3e30270 fix travis 2020-10-14 11:20:27 +02:00
stickler-ci
8bfb04ea7f Fixing style errors. 2020-10-14 08:34:30 +00:00
Florian HENRY
08379cbfc6 Merge branch 'dev_objectrefferent_for_BOM' of github.com:FHenry/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 10:32:07 +02:00
Florian HENRY
ee67d2b1a8 fixnhish bom product stats 2020-10-14 10:30:39 +02:00
stickler-ci
7abb0caf91 Fixing style errors. 2020-10-14 06:47:16 +00:00
Florian HENRY
6ff58aafdc Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-14 08:43:07 +02:00
Florian HENRY
74155a49be finish BOM stat referent object 2020-10-14 08:42:57 +02:00
Laurent Destailleur
7838ca32ba Fix sql injection reported by Jason Nordenstam 2020-10-14 01:52:53 +02:00
Laurent Destailleur
4a3a3190ea Standardize pdf templates 2020-10-14 01:46:49 +02:00
bahfir abbes
8b0a6d7f40 fix:two fields with same ids is incorrect html 2020-10-14 00:21:12 +01:00
bahfir abbes
ad21f1e293 fix:boolean values in showinputfield are 1 and 0 not 'on' and 'off' 2020-10-14 00:15:51 +01:00
Laurent Destailleur
85825a0104 Init page for security info 2020-10-14 00:57:39 +02:00
bahfir abbes
4ee6cedbe6 Option d’Activation du fichier global de configuration. 2020-10-13 23:33:25 +01:00
Laurent Destailleur
c539c6d00d Responsive 2020-10-13 17:36:45 +02:00
stickler-ci
dcd8a88e72 Fixing style errors. 2020-10-13 13:28:23 +00:00
Sekan, Tobias
f28e1dc4fb cleanup 2020-10-13 15:27:42 +02:00
Regis Houssin
0407ab013c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2 2020-10-13 15:09:54 +02:00
Sekan, Tobias
dfff32f239 Selectable columns on sales tax list 2020-10-13 15:09:25 +02:00
Laurent Destailleur
805fa00422 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 15:09:24 +02:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-13 15:08:53 +02:00
Regis Houssin
00ee1a7433 FIX compatibility with LF (Line Feed) 2020-10-13 15:08:43 +02:00
Laurent Destailleur
f1f1f2b9c8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:34 +02:00
Laurent Destailleur
496d429dcd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:25 +02:00
Laurent Destailleur
035325152f Fix migration 2020-10-13 15:02:05 +02:00
davidNDU
43a029ef2f Model Builder template/class/myobject.class.php faulty SQL statement 2020-10-13 15:59:50 +03:00
Regis Houssin
1348c03ca0 FIX avoid spaces in file name 2020-10-13 14:46:17 +02:00
Aurélien
abfcb73a45
FIX unkwown columm tms #14947 2020-10-13 12:10:06 +02:00
Laurent Destailleur
85f15b5f69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-13 11:52:34 +02:00
Laurent Destailleur
969ed4acc1 Better label for status schedule of cron tasks. 2020-10-13 11:52:20 +02:00
Laurent Destailleur
32fe8a37b4
Merge pull request #14992 from TobiasSekan/SelectableColumnsOnSocialTaxesList 
NEW Select-able columns on social taxes list
 2020-10-13 11:11:06 +02:00
Laurent Destailleur
69432284d0
Merge pull request #14999 from andreubisquerra/master 
NEW: Add third order printer to TakePOS
 2020-10-13 11:03:41 +02:00
Laurent Destailleur
4f28b3e7ff
Merge pull request #15003 from grandoc/new_branch_13_10_2020 
fix Call to undefined method Form::formTransportMode()
 2020-10-13 11:03:11 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
Laurent Destailleur
bc6b5d919a Better responsive 2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00
Philippe GRAND
d66a1ac350 fix Call to undefined method Form::formTransportMode() 2020-10-13 10:05:44 +02:00
Florian HENRY
4bf428fbf8 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-13 08:13:54 +02:00
andreubisquerra
d80931429e
Fix travis 2020-10-12 22:34:05 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
57702a1fb1 Retrieve commit a056d37f7255200ef0baf664a6b64516b2392dd9 2020-10-12 20:47:32 +02:00
Laurent Destailleur
e00cf0d37c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-12 19:40:13 +02:00
Laurent Destailleur
042a9f3efe Fix missing newtoken() 2020-10-12 19:39:54 +02:00
Laurent Destailleur
66a6415230
Merge pull request #14994 from grandoc/new_branch_12_10_2020 
fix : undefined index
 2020-10-12 19:37:37 +02:00
Laurent Destailleur
ff8f4c46d9
Merge pull request #14996 from Givriz/dev 
Fix : correction de commentaires
 2020-10-12 19:37:03 +02:00
Laurent Destailleur
fcd4645509 Standardize code: Property product_libelle renamed into product_label 
Move common vars declaration into parent class.
 2020-10-12 19:33:00 +02:00
Damien BENOIT
276783a709
Essai de revalidation 
Une ligne n'était pas synchronisée avec le projet upstream.
 2020-10-12 18:36:13 +02:00
Givriz
d158716ccc Fix : correction de commentaires 
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais). Il reste beaucoup à faire, mais je fais un premier PR pour vérifier que cela marche.
 2020-10-12 17:41:03 +02:00
Philippe GRAND
4da75c4251 fix : undefined index 2020-10-12 16:11:56 +02:00
Laurent Destailleur
ad461a098b Fix look and feel 2020-10-12 14:06:19 +02:00
stickler-ci
675b1e613b Fixing style errors. 2020-10-12 12:05:38 +00:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Sekan, Tobias
3b905bdcd5 Selectable columns on social taxes list 2020-10-12 14:00:33 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
9d2b383864
Merge pull request #14987 from FHenry/develop 
fix : add missing Autocomplete payment amount "arrow" donnation payment
 2020-10-12 13:07:09 +02:00
Laurent Destailleur
9eb45c500f
Merge pull request #14988 from aspangaro/13a24 
FIX Show accounting account in supplier invoice when line is binded
 2020-10-12 13:06:34 +02:00
Laurent Destailleur
b27c95bab0
Merge pull request #14989 from FHenry/dev_finish_packingfeature 
fix : finish packging feature (allow to edit packaging quantity)
 2020-10-12 13:05:34 +02:00
Laurent Destailleur
3805a7877b
Update fournisseurs.php 2020-10-12 13:05:18 +02:00
Laurent Destailleur
a1dd922394
Update modProduct.class.php 2020-10-12 13:04:10 +02:00
Laurent Destailleur
a1c01b6408
Merge pull request #14991 from FHenry/dev_fixBOM_withunit_feature 
Dev fix bom with PRODUCT USE UNIT feature
 2020-10-12 12:55:00 +02:00
Laurent Destailleur
a514c20183 Add warning if we try to add a task on a draft project 2020-10-12 12:53:57 +02:00
Laurent Destailleur
1538823b4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-12 12:34:18 +02:00
Laurent Destailleur
d831edb481 Fix bad popup 2020-10-12 12:33:58 +02:00
Florian HENRY
a054a27090 fix unit usage into BOM line 2020-10-12 12:23:47 +02:00
Laurent Destailleur
bf458215c1
Merge branch 'develop' into 12.0 2020-10-12 12:14:39 +02:00
atm-lena
bf7d5b56fb FIX subcat filter 2020-10-12 11:50:19 +02:00
Florian HENRY
c3a900a41c need to update packaging quantity 2020-10-12 11:44:12 +02:00
Florian HENRY
0b9783b7ed fix #14946 2020-10-12 11:31:09 +02:00
Laurent Destailleur
45e2a6409e Missing field 2020-10-12 11:30:53 +02:00
Florian HENRY
cea6eb279f add immport packaging supplier quantity 2020-10-12 11:26:09 +02:00
Florian HENRY
1f6a99e361 Merge github.com:Dolibarr/dolibarr into dev_finish_packingfeature 2020-10-12 11:11:23 +02:00
Florian HENRY
df4b208de1 fix: add missing edit field with pakaging option on 2020-10-12 11:10:49 +02:00
Alexandre SPANGARO
dd7415c937 Revert dol_fiche_head 2020-10-12 11:00:04 +02:00
Alexandre SPANGARO
873cf24641 FIX Show accounting account in supplier invoice when line is binded 2020-10-12 10:39:37 +02:00
Florian HENRY
371edd3052 Merge github.com:Dolibarr/dolibarr into develop 2020-10-12 09:43:01 +02:00
Florian HENRY
042b3f1843 fix donation payment with autocomplete 2020-10-12 09:42:35 +02:00
Laurent Destailleur
e2848fd229
Merge pull request #14980 from aspangaro/13a22 
FIX #14956 Add a possibility to modify date on credit note invoice
 2020-10-11 13:35:31 +02:00
Laurent Destailleur
920b31140b Fix exclude of backup files when path are for Windows 2020-10-11 13:32:50 +02:00
Laurent Destailleur
86c46bbb97 Fix backup - Exclude existing backup when path is uppercase. 2020-10-11 13:18:16 +02:00
Laurent Destailleur
ced91d049d Show admin star on audit page list 2020-10-10 16:43:15 +02:00
Laurent Destailleur
0b619f63f3 Fix error management on HR modules 2020-10-10 16:35:30 +02:00
Laurent Destailleur
b36b9170b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Laurent Destailleur
29f19d9550
Merge pull request #14964 from TobiasSekan/MoreFilterOnLeaveLog 
NEW More filter for "View change logs"
 2020-10-10 15:35:55 +02:00
Laurent Destailleur
7fb871d830
Merge pull request #14982 from FHenry/develop 
fix return on filtered page when modify accountancy code and docker port expose
 2020-10-10 15:22:48 +02:00
Philippe GRAND
ba674d09d3 add some translations 2020-10-10 14:45:58 +02:00
Philippe GRAND
094dbc1265 add some translations 2020-10-10 14:38:57 +02:00
Philippe GRAND
37b6a43c5c add some translations 2020-10-10 14:30:22 +02:00
Florian HENRY
0fee06139a Merge github.com:Dolibarr/dolibarr into develop 2020-10-10 10:23:17 +02:00
Florian HENRY
705b029608 fix return on filtered page when modify accountancy code 2020-10-10 10:22:58 +02:00
Alexandre SPANGARO
231a866838 FIX Loan - Return on list when you cancel create form or delete a loan 2020-10-10 07:38:29 +02:00
Alexandre SPANGARO
ae64e513a8 FIX #14956 Add a possibility to modify date on credit note invoice 2020-10-10 07:19:13 +02:00
Alexandre SPANGARO
5ffba68bee Fix 2020-10-10 06:50:28 +02:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Laurent Destailleur
7b036f26fc
Merge pull request #14977 from davidNDU/clone/develop 
Fix: Module Builder creation and listing of events
 2020-10-09 19:50:58 +02:00
Laurent Destailleur
b1a838f19f
Update myobject_agenda.php 2020-10-09 19:48:35 +02:00
Laurent Destailleur
136e0da1c1
Merge pull request #14976 from fappels/develop_fix_migration 
Develop fix migration
 2020-10-09 19:45:14 +02:00
Laurent Destailleur
967e7997e6 Trans and clean code 2020-10-09 19:34:57 +02:00
Laurent Destailleur
cc82a15688 css 2020-10-09 18:43:24 +02:00
Laurent Destailleur
327ca5f595 css 2020-10-09 18:18:18 +02:00
Laurent Destailleur
4188a21c6b css 2020-10-09 17:59:22 +02:00
Laurent Destailleur
a3e3e0e45c Navigation in chart of account 2020-10-09 17:55:26 +02:00
Laurent Destailleur
5e3df9442f css 2020-10-09 16:57:00 +02:00
Laurent Destailleur
9ba22b97b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-09 16:49:38 +02:00
Laurent Destailleur
28e462e507 Debug a box with sql and performance errors 2020-10-09 16:49:23 +02:00
davidNDU
78654376ca Fix: Module Builder creation and listing of events 2020-10-09 16:54:13 +03:00
Alexandre SPANGARO
3728ab5ded Fix Travis 2020-10-09 15:37:27 +02:00
Francis Appels
4fb83a0dd6 Fix migration 2020-10-09 15:35:09 +02:00
Alexandre SPANGARO
b938cc92f2 Fix Travis 2020-10-09 15:19:09 +02:00
Alexandre SPANGARO
473702487d Fix Travis 2020-10-09 14:44:28 +02:00
Laurent Destailleur
5b4c32ff84
Merge pull request #14930 from FHenry/develop 
fix bad test syntax
 2020-10-09 13:59:27 +02:00
Laurent Destailleur
501adf8151
Merge pull request #14975 from code-chicken/patch-9 
Fix for #14239 / Method printObjectLine was called on an object and object->fetch_thirdparty was not done before
 2020-10-09 13:58:42 +02:00
Alexandre SPANGARO
4dcd2bfcda Fix Travis 2020-10-09 13:58:35 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch 
NEW: Add global search for customer payments and vendor payments
 2020-10-09 13:56:52 +02:00
Laurent Destailleur
85a9714d07
Merge pull request #14972 from code-chicken/patch-7 
Fix for #14957 and probably a lot of other issues
 2020-10-09 13:55:29 +02:00
Laurent Destailleur
a4e8773c30
Merge pull request #14973 from hregis/develop_timestamp 
FIX avoid warning "Parameter must be an array or an object that implements Countable"
 2020-10-09 13:55:10 +02:00
Laurent Destailleur
1239152368
Update dolgraph.class.php 2020-10-09 13:54:47 +02:00
Laurent Destailleur
efc5dedab4 Fix format number on screen 2020-10-09 12:52:42 +02:00
Florian HENRY
29bf3d0439 Merge github.com:Dolibarr/dolibarr into develop 2020-10-09 12:20:29 +02:00
Florian HENRY
bbdf304f1e fix 2020-10-09 12:20:20 +02:00
Alexandre SPANGARO
38732914ad Fix sticklerCI 2020-10-09 11:59:27 +02:00
Laurent Destailleur
e24ec99c8f Fix regression 2020-10-09 11:51:34 +02:00
Laurent Destailleur
4eaf2c0350 Fix regression 2020-10-09 11:49:45 +02:00
Rüdiger Hahn
d789aaad7f
Fix for #14239 
Message: Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before
 2020-10-09 11:29:39 +02:00
Rüdiger Hahn
3b7b4312cb
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 11:13:11 +02:00
Laurent Destailleur
b6fc33c454 Fix avoid error when we sumbit form to change page on conciliation 2020-10-09 11:13:02 +02:00
Regis Houssin
5ffeb5d639 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_timestamp 2020-10-09 11:04:23 +02:00
Regis Houssin
b591e6510b FIX avoid warning "Parameter must be an array" 2020-10-09 11:03:44 +02:00
Rüdiger Hahn
5510f1feef
Fix for #14957 and probably a lot of other issues 
Convert special characters for a valid use in xml documents
 2020-10-09 10:59:06 +02:00
Laurent Destailleur
fe2e41527a Fix sql error 2020-10-09 10:28:26 +02:00
Laurent Destailleur
ec28a4fcdc More info on tooltip 2020-10-09 10:21:07 +02:00
Laurent Destailleur
5ac7d4dbac Show last 12 bank receipts instead of 15 2020-10-09 10:02:13 +02:00
Alexandre SPANGARO
b3b37dd9ee Fix sticklerCI 2020-10-09 09:32:50 +02:00
stickler-ci
6b3f20dc65 Fixing style errors. 2020-10-09 07:29:25 +00:00
Sekan, Tobias
35fbc602ee Add global payment search 2020-10-09 09:22:26 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
fbd9229f9b
Fix: no formatting when storing into memory. Formatting when forging sql 2020-10-08 20:03:16 +02:00
Laurent Destailleur
5352eb6734
Merge pull request #14967 from hregis/develop_timestamp 
FIX add default value of timestamp for avoid error
 2020-10-08 19:40:59 +02:00
Laurent Destailleur
1b92e03f47
Merge pull request #14921 from ptibogxiv/patch-383 
NEW set entity when creating invoice on takepos
 2020-10-08 19:30:37 +02:00
Laurent Destailleur
0628c92bdb
Merge pull request #14960 from rabib-metroworks/import-po 
NEW ADDED IMPORT TOOL FOR PO
 2020-10-08 19:29:53 +02:00
Laurent Destailleur
01ab066b7b
Merge pull request #14963 from atm-quentin/NEW_helper_functions 
NEW helper functions for export with phpspreadsheet
 2020-10-08 19:29:16 +02:00
Laurent Destailleur
66744658a2
Merge pull request #14966 from hregis/12_bug 
FIX Multicompany compatibility (missing entity value)
 2020-10-08 19:26:49 +02:00
Laurent Destailleur
c7784076c5
Merge pull request #14969 from atm-john/12.0_fix_project_loan_total 
Fix  total loan calculation on project summary
 2020-10-08 19:23:43 +02:00
Laurent Destailleur
e854cce158
Update element.php 2020-10-08 19:23:35 +02:00
Laurent Destailleur
e7c456f6f2 NEW Add column payment term into list of supplier invoices. 2020-10-08 19:22:21 +02:00
ATM john
3bf12ca193 Fix total loan calculation 2020-10-08 19:10:41 +02:00
Aurélien
3daf530a92
Revert "update dependencies migration12->13.sql #14697" 
This reverts commit 5fa481422a.
 2020-10-08 18:52:17 +02:00
Laurent Destailleur
047d6f78e7 Fix status disabled of task intocombo list 2020-10-08 17:49:26 +02:00
Laurent Destailleur
925f240340 Fix user 2020-10-08 17:13:51 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Regis Houssin
0dc24c87b8 FIX nuke DEFAULT CURRENT_TIMESTAMP in pgsql 2020-10-08 16:16:49 +02:00
Aurélien
5fa481422a
update dependencies migration12->13.sql #14697 2020-10-08 15:56:44 +02:00
Regis Houssin
09e7420936 FIX missing entity in href 2020-10-08 15:51:46 +02:00
Laurent Destailleur
ed3a4de438 Fix security hole 2020-10-08 14:30:59 +02:00
Regis Houssin
111f73bd86 FIX add default value of timestamp for avoid error 2020-10-08 12:29:01 +02:00
Laurent Destailleur
b8681c0b41 css 2020-10-08 11:59:33 +02:00
Laurent Destailleur
24d35ff9b5 CSS 2020-10-08 11:52:58 +02:00
Regis Houssin
aa84b76b6a FIX Multicompany compatibility (missing entity value) 2020-10-08 11:43:12 +02:00
Laurent Destailleur
3cd953bc41 Fix colspan 2020-10-08 11:40:05 +02:00
quentin
77552c6508 Merge branch 'NEW_helper_functions' of github.com:atm-quentin/dolibarr into NEW_helper_functions 2020-10-08 10:50:08 +02:00
atm-lena
74ae9a2618 FIX CA report by product/service : subcategory filter 2020-10-08 10:49:46 +02:00
quentin
7591ec6cf6 FIX style 2020-10-08 10:49:29 +02:00
stickler-ci
f4c3d9d7bb Fixing style errors. 2020-10-08 08:38:28 +00:00
stickler-ci
f5b34370b6 Fixing style errors. 2020-10-08 08:34:40 +00:00
quentin
fe8d7f7f1b missing public parameter 2020-10-08 10:32:16 +02:00
Sekan, Tobias
7e3a3a4cf3 Add more filter for leave log view 2020-10-08 10:30:09 +02:00
quentin
bf97d2a50f NEW helper functions for export with phpspreadsheet 2020-10-08 10:26:30 +02:00
Laurent Destailleur
4674eda45a Standardize columns comment 2020-10-08 10:13:44 +02:00
Laurent Destailleur
688d915cca CSS 2020-10-08 10:04:36 +02:00
Laurent Destailleur
70fa262293 CSS 2020-10-08 09:30:15 +02:00
Aurélien
9c02390066
fix migration12->13.sql #14697 
fix drop constraint
fix error on update extrafields
 2020-10-07 21:50:54 +02:00
Aurélien
16e076d182
fix UPDATE llx_extrafields.elementtype = livraison to delivery #14697 2020-10-07 20:54:56 +02:00
Ahmad Jamaly Rabib
40e16cc840 NEW ADDED IMPORT TOOL FOR PO 
Added Purchase Order import functionality
 2020-10-08 00:34:53 +06:00
Laurent Destailleur
ff739dcbd2 Increase size of small image (used by PDF) 2020-10-07 19:39:17 +02:00
Laurent Destailleur
1a39e963a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-07 17:41:55 +02:00
Laurent Destailleur
eb41a72e27 Properties ->titre have been renamed into ->title 2020-10-07 17:41:36 +02:00
Laurent Destailleur
532cdd639f
Merge pull request #14955 from Dolisupport/develop 
Improved emailconfirmation of ticket module when you create a new ticket
 2020-10-07 17:19:56 +02:00
Laurent Destailleur
561ca757d7 phpcs 2020-10-07 17:17:13 +02:00
Hans
57acfb738f
Update card.php 2020-10-07 16:48:50 +02:00
Hans
f6f164893e
Update ticket.class.php 2020-10-07 16:45:06 +02:00
Laurent Destailleur
24295b309d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-07 15:38:24 +02:00
Laurent Destailleur
c7ca99accb Fix default value of enabled property of menu entry 2020-10-07 15:38:07 +02:00
Laurent Destailleur
213cefb570
Merge pull request #14941 from aspangaro/13a22 
WIP NEW Add clone functionality on miscellaneous payment
 2020-10-07 15:31:09 +02:00
Laurent Destailleur
45762ecccb Use ajax select2 beautifier in select component of type of holiday 2020-10-07 15:28:19 +02:00
Laurent Destailleur
85f38f7504 css 2020-10-07 15:27:50 +02:00
Laurent Destailleur
400146bed4
Merge pull request #14953 from TobiasSekan/MoreFilterOnMonthlyStatementList 
NEW Add more filters on monthly statement list
 2020-10-07 15:23:47 +02:00
Laurent Destailleur
ad5641dc76
Merge pull request #14951 from TobiasSekan/SelectableColumnsOnSupplierInvoicePaymentList 
NEW Select-able columns on supplier invoice payment list
 2020-10-07 15:19:19 +02:00
Laurent Destailleur
415840e346
Merge pull request #14952 from TobiasSekan/AllowZeroQualityOnSupplierOrderLines 
NEW Allow zero quality on supplier/vendor order line
 2020-10-07 15:07:53 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
96ab66ea5a Add function 2020-10-07 14:58:54 +02:00
Laurent Destailleur
4c87949be0 Fix scrutinizer 2020-10-07 14:53:10 +02:00
Sekan, Tobias
a119a75fe0 add more filter on monthly statement list 2020-10-07 14:00:32 +02:00
Laurent Destailleur
5da923c80d phpcs 2020-10-07 13:42:46 +02:00
Laurent Destailleur
3ace9f638a Clean code 2020-10-07 13:20:38 +02:00
Sekan, Tobias
3f39766064 Allow zero quality on supplier order line 2020-10-07 13:10:04 +02:00
Laurent Destailleur
33fe5eb85f Fix sql request 2020-10-07 12:53:17 +02:00
Laurent Destailleur
e369610538 Fix 2020-10-07 12:48:05 +02:00
Laurent Destailleur
59e89fd53a Fix 2020-10-07 12:42:41 +02:00
Laurent Destailleur
145b1e97ca Fix sql 2020-10-07 12:41:25 +02:00
Laurent Destailleur
d1c2772ee7 NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open 
any url into a dialog popup.
 2020-10-07 12:31:15 +02:00
Florian HENRY
36353f7c9b Merge github.com:Dolibarr/dolibarr into develop 2020-10-07 12:04:18 +02:00
stickler-ci
85b7458b02 Fixing style errors. 2020-10-07 09:24:37 +00:00
Sekan, Tobias
e26ab93179 missing code remove from last commit 2020-10-07 11:22:23 +02:00
Sekan, Tobias
29ee420f3e Selectable columns on sup. invoice payment list 2020-10-07 11:18:31 +02:00
Alexandre SPANGARO
973502bb1e Fix 2020-10-07 09:36:29 +02:00
Laurent Destailleur
8febb19b50 Translation 2020-10-07 01:12:27 +02:00
Laurent Destailleur
294688891d CSS 2020-10-07 01:10:26 +02:00
Laurent Destailleur
84105e996a Fix for #14940 2020-10-07 01:03:48 +02:00
Laurent Destailleur
ea8ec4ea90 Clean code 2020-10-07 00:59:05 +02:00
Laurent Destailleur
31f4d99e19 css 2020-10-07 00:53:01 +02:00
Laurent Destailleur
e9bcd95c39 Add information column on page to export source of accounting document 2020-10-07 00:49:19 +02:00
Laurent Destailleur
77788a0591 Clean code 2020-10-07 00:26:03 +02:00
Laurent Destailleur
f16a58a62c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSocialNetworks.class.php
 2020-10-06 23:36:15 +02:00
Laurent Destailleur
47c80f0d14
Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount 
Show count on project overview tab
 2020-10-06 23:34:43 +02:00
Laurent Destailleur
13ec304b79
Update project.lib.php 2020-10-06 23:30:51 +02:00
Laurent Destailleur
04f8de4188 Remove dependency 2020-10-06 17:59:31 +02:00
Laurent Destailleur
2c5d396546 Fix upload file 2020-10-06 17:45:08 +02:00
Laurent Destailleur
b0d20f92dc FIX autofocus on first setup 2020-10-06 17:32:55 +02:00
Laurent Destailleur
459ebe2e56 css 2020-10-06 17:26:55 +02:00
Laurent Destailleur
00e9a9a509 Sanitize color 2020-10-06 17:10:00 +02:00
Laurent Destailleur
ca189099dd Look and feel v13 2020-10-06 17:00:17 +02:00
Laurent Destailleur
663f149982 Better error management 2020-10-06 16:48:48 +02:00
Laurent Destailleur
a744abce94 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 16:30:12 +02:00
Laurent Destailleur
e247b2de61 FIX list of fields in list of recurring invoices was empty 2020-10-06 16:29:29 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173
:mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Laurent Destailleur
4ea102f1de css 2020-10-06 15:18:32 +02:00
Laurent Destailleur
95f67309e2 Clean code 2020-10-06 15:11:45 +02:00
Alexandre SPANGARO
503f190fd4 Fix 2020-10-06 14:39:10 +02:00
Aurélien
d103a9aede
rename table on migration #14697 2020-10-06 14:35:27 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Laurent Destailleur
254d9edbb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:18:58 +02:00
Laurent Destailleur
6933b7ec9c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/agenda.lib.php
 2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-06 13:13:31 +02:00
Laurent Destailleur
3f5db927bc Fix phpcs 2020-10-06 13:13:07 +02:00
Laurent Destailleur
c3b2371c6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:08:34 +02:00
Laurent Destailleur
4701656d95 Fix look and field v13 2020-10-06 13:08:20 +02:00
Sekan, Tobias
3ceb5c217f Show count on project overview tab 2020-10-06 12:56:28 +02:00
Laurent Destailleur
222b49b3cf
Merge pull request #14799 from atm-greg/New_trigger_handler_in_modulebuilder 
new handle trigger method
 2020-10-06 12:36:51 +02:00
Laurent Destailleur
a32456afc5
Update interface_99_modMyModule_MyModuleTriggers.class.php 2020-10-06 12:35:18 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Laurent Destailleur
ef2e531d34
Merge pull request #14928 from TobiasSekan/SelectableColumnsOnCustomerInvoicePaymentList 
NEW Select-able columns on customer invoice paymnet list
 2020-10-06 12:28:20 +02:00
Laurent Destailleur
1c38379622 Better message 2020-10-06 12:22:58 +02:00
Laurent Destailleur
38acd83f4d Review some titles and tooltip help to be more clear. 2020-10-06 12:17:33 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6
change variable #14697 2020-10-06 11:37:55 +02:00
Aurélien
140200213e
change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
lvessiller
496150d747 FIX extrafield required error after submit 2020-10-06 10:21:24 +02:00
Laurent Destailleur
c5c8bd7838
Merge pull request #14937 from aspangaro/13a21 
NEW Accountancy - Move to real ledger, real journals, menu disposition
 2020-10-06 10:04:41 +02:00
Alexandre SPANGARO
050a4770d3 WIP NEW Add clone functionality on miscellaneous payment 2020-10-06 10:04:15 +02:00
Laurent Destailleur
8d0b9169bc
Merge pull request #14936 from aspangaro/13a20 
NEW Vat report - Invert constant to show by default zero vat in reports
 2020-10-06 10:00:00 +02:00
Laurent Destailleur
4ca3957349
Merge pull request #14934 from frederic34/patch-4 
fix typo
 2020-10-06 09:58:13 +02:00
Laurent Destailleur
48ed3f5783
Merge pull request #14933 from ptibogxiv/patch-386 
FIX php error in takepos
 2020-10-06 09:57:40 +02:00
Laurent Destailleur
351f80c540
Update index.php 2020-10-06 09:57:04 +02:00
Laurent Destailleur
9ad75b46d9
Merge pull request #14935 from frederic34/patch-6 
doxygen
 2020-10-06 09:55:51 +02:00
Laurent Destailleur
9ada5c7427
Merge pull request #14938 from ppenelon/ppenelon-patch-1 
FIX Require Discount class on markAsCreditAvailable API method
 2020-10-06 09:55:28 +02:00
Laurent Destailleur
054c58df16 Add currency into the select 2020-10-06 09:53:29 +02:00
Laurent Destailleur
4290395375 Fix according to PR #14939 2020-10-06 09:53:10 +02:00
Laurent Destailleur
7c6c319607 Trans 2020-10-06 09:31:54 +02:00
stickler-ci
8f542a8572 Fixing style errors. 2020-10-06 06:56:08 +00:00
Sekan, Tobias
33b7d06bb9 address feedback + tooltip + reduce indent 2020-10-06 08:46:53 +02:00
stickler-ci
b9cc780c3c Fixing style errors. 2020-10-05 21:58:00 +00:00
Pierre Penelon
609a29219d
FIX|Missing require in API : markAsCreditAvailable 
Quick fix of a problem I encountered earlier when using `markAsCreditAvailable` API method for invoice routes.
The method was using the `DiscountAbsolute` class without importing it resulting in a 500 HTTP error.
 2020-10-05 23:54:37 +02:00
Alexandre SPANGARO
6745c377a6 Double line 2020-10-05 22:35:12 +02:00
Alexandre SPANGARO
6a0f2233a6 NEW Accountancy - Move to real ledger, real journals, menu disposition 2020-10-05 21:44:39 +02:00
Alexandre SPANGARO
d83d9895e0 NEW Vat report - Invert constant to show by default zero vat in reports 2020-10-05 20:52:31 +02:00
Frédéric FRANCE
83eb7a8d8d
doxygen 2020-10-05 20:16:18 +02:00
Frédéric FRANCE
005cc093b9
fix typo 2020-10-05 20:02:23 +02:00
ptibogxiv
bb0b9dc128
FIX php error in takepos 2020-10-05 18:16:32 +02:00
Laurent Destailleur
73b40828c8 Trans 2020-10-05 18:15:37 +02:00
Laurent Destailleur
25b9460521 Look and feel v12 2020-10-05 18:05:26 +02:00
Laurent Destailleur
ad087ac360 Use color of RH module for type "employee" 2020-10-05 17:24:47 +02:00
Laurent Destailleur
9b768b5eab
Merge pull request #14926 from aspangaro/13a17 
NEW Accountancy - Add chart of sub accounts
 2020-10-05 17:20:14 +02:00
Laurent Destailleur
03226ad2a5
Merge pull request #14810 from TobiasSekan/FixAdminCanRemoveAllHisUserRights 
FIX that a admin can remove all his user rights
 2020-10-05 17:18:24 +02:00
Laurent Destailleur
9309048bda
Merge pull request #14923 from ptibogxiv/patch-385 
New display currency in takepos payment
 2020-10-05 16:45:17 +02:00
Laurent Destailleur
23f1137c84
Merge pull request #14920 from rabib-metroworks/import-vendor-invoice 
NEW Can import Supplier invoice
 2020-10-05 16:44:49 +02:00
Laurent Destailleur
bb39d7b205
Merge pull request #14916 from ptibogxiv/patch-382 
Fix  and save change of currency in invoice (takepos)
 2020-10-05 16:44:28 +02:00
Laurent Destailleur
44ecc15a07
Merge pull request #14915 from ptibogxiv/patch-380 
Fix reload display when invoice deleting in takepos
 2020-10-05 16:43:55 +02:00
Laurent Destailleur
196cb9c7f6
Merge pull request #14929 from rabib-metroworks/import-order-module 
NEW Can import sales order
 2020-10-05 16:43:29 +02:00
Laurent Destailleur
0fdad1b63d
Merge pull request #14914 from ptibogxiv/patch-379 
Fix better display print/send button on takepos
 2020-10-05 16:43:11 +02:00
Laurent Destailleur
10d21eee03
Merge pull request #14911 from ptibogxiv/patch-376 
Fix display stock rights in takepos
 2020-10-05 16:42:31 +02:00
Laurent Destailleur
24527c973d
Merge pull request #14910 from ptibogxiv/patch-375 
Fix multicompany in activity box
 2020-10-05 16:42:14 +02:00
Laurent Destailleur
ffc0f51827
Merge pull request #14909 from ptibogxiv/patch-374 
Fix multicurrency modal in takepos
 2020-10-05 16:41:56 +02:00
Laurent Destailleur
099c19cefb
Merge pull request #14912 from ptibogxiv/patch-378 
NEW multicurrency total in takepos
 2020-10-05 16:40:59 +02:00
Laurent Destailleur
a26f9b66f6
Merge pull request #14919 from frederic34/patch-4 
doxygen
 2020-10-05 16:39:14 +02:00
Laurent Destailleur
e5cdffcdec
Merge pull request #14922 from andreubisquerra/develop 
TakePOS connector compatibility with RECEIPT PRINTERS module
 2020-10-05 16:38:56 +02:00
Laurent Destailleur
243d576f83
Update invoice.php 
Log for debug
 2020-10-05 16:38:40 +02:00
Laurent Destailleur
1b9b04db87
Merge pull request #14925 from zedzedtop/develop 
Enable TPL overriding for document_actions_post_headers.tpl.php
 2020-10-05 16:36:35 +02:00
Aurélien
c1b0c1f6a2
rename folder ref to Module Delivery 2020-10-05 15:32:29 +02:00
stickler-ci
0e7d429991 Fixing style errors. 2020-10-05 13:24:17 +00:00
Christian Foellmann
fb7ed3afc1 optimize mail templates edit screen 2020-10-05 15:20:27 +02:00
Florian HENRY
4e711d4e30 fix bad test syntax 2020-10-05 15:15:15 +02:00
Laurent Destailleur
afd6da3b94 Better error management 2020-10-05 14:51:28 +02:00
Laurent Destailleur
5c3b83b82e Show small image in setup page 2020-10-05 14:06:14 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Ahmad Jamaly Rabib
4a6000c750 NEW ADDED IMPORT TOOL FOR CUSTOMER ORDER 
Added Order import functionality in import module
 2020-10-05 16:39:26 +06:00
Laurent Destailleur
ee40aeecce Standardize API 2020-10-05 12:21:54 +02:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Sekan, Tobias
8447817f8c fix swapped array entries 2020-10-05 11:38:07 +02:00
Sekan, Tobias
3984d8c2b8 Add selectable columns on cust. invoice pay. list 2020-10-05 11:27:44 +02:00
Alexandre SPANGARO
8d4fe7567a Merge branch '13a17' of https://github.com/aspangaro/dolibarr into 13a17 2020-10-05 10:11:32 +02:00
Alexandre SPANGARO
8ee7861276 Typo 2020-10-05 10:11:19 +02:00
stickler-ci
cf76a67712 Fixing style errors. 2020-10-05 08:10:39 +00:00
Alexandre SPANGARO
cab6ef092f NEW Accountancy - Add chart of sub accounts 2020-10-05 10:05:21 +02:00
Laurent Destailleur
8a079cf716 Code comment 2020-10-05 09:31:12 +02:00
Sébastien
6c11f7823a
Enable TPL overriding for document_actions_post_headers.tpl.php 
Currently it is not possible to override the "document_actions_post_headers.tpl.php" template via a third party module. This addition of code adds this possibility
 2020-10-05 10:16:30 +04:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
a68ba1704b Fix phpcs 2020-10-05 02:25:57 +02:00
Laurent Destailleur
800c0d2b00 Fix method must return a string not print on output 2020-10-05 02:24:45 +02:00
Laurent Destailleur
fb15277c15 Better tooltip 2020-10-04 23:53:15 +02:00
ptibogxiv
078459fc44
New display currency in takepos payment 
to do in next PR (payment with multicurrency in other currency that principal)
 2020-10-04 23:35:19 +02:00
Laurent Destailleur
a6fe03bd14 Fix doc 2020-10-04 23:30:41 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2020-10-04 23:27:52 +02:00
Laurent Destailleur
ca16606b4f Fix phpcs 2020-10-04 23:21:24 +02:00
andreubisquerra
1c34a7acda
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:50:27 +02:00
andreubisquerra
65c6881fc9
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:49:47 +02:00
ptibogxiv
1a407e4c22
NEW set entity when creating invoice on takepos 
usefull for marketplace, coworking, multibranding shop
 2020-10-04 22:09:40 +02:00
Ahmad Jamaly Rabib
66a1aa9a86 NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE 
Added supplier invoice import functionality in import module
 2020-10-05 00:39:35 +06:00
Frédéric FRANCE
4aa47d14b4
Update bookkeeping.class.php 2020-10-04 20:29:57 +02:00
Laurent Destailleur
07e1646b3a Minor fixes 2020-10-04 19:09:25 +02:00
Laurent Destailleur
aeb895b1c6 CSS 2020-10-04 18:43:56 +02:00
ptibogxiv
55764779c4
Update invoice.php 2020-10-04 17:12:01 +02:00
ptibogxiv
e280fc3ad1
Fix and save change of currency in invoice (takepos) 2020-10-04 16:53:31 +02:00
stickler-ci
32a882e83c Fixing style errors. 2020-10-04 13:56:36 +00:00
ptibogxiv
fac60bdf24
Fix reload display when invoice deleting 2020-10-04 15:54:23 +02:00
ptibogxiv
eaedcff2a8
Fix better display print/send button on takepos 2020-10-04 15:01:22 +02:00
ptibogxiv
1e6ad59856
Update invoice.php 2020-10-04 14:42:16 +02:00
stickler-ci
d25c5bf36a Fixing style errors. 2020-10-04 12:40:52 +00:00
ptibogxiv
31dd9885e6
NEW multicurrency total in takepos 2020-10-04 14:39:02 +02:00
ptibogxiv
415deb1500
Fix display stock rights in takepos 
only display if user have read right
 2020-10-04 14:27:03 +02:00
ptibogxiv
4aafe72bf2
Fix multicompany in activity box 2020-10-04 14:19:53 +02:00
ptibogxiv
36fc987f1e
Fix multicurrency modal 
+ avoid loud page if not used
 2020-10-04 14:04:44 +02:00
ptibogxiv
dd1904c521
Fix multicompany in last action box 2020-10-04 13:58:46 +02:00
Laurent Destailleur
2ca28c37b6
Merge pull request #14790 from c3do/patch-14 
FIX API paymentsdistributed accept multicurrency part payment
 2020-10-04 11:28:33 +02:00
Laurent Destailleur
f09258713e
Merge pull request #14907 from andreubisquerra/master 
NEW: TakePOS Multicurrency compatibility
 2020-10-04 11:26:58 +02:00
andreubisquerra
4c64b99235
Lang fix 2020-10-03 23:16:13 +02:00
andreubisquerra
d43d1e8519
Clean 2020-10-03 23:03:08 +02:00
andreubisquerra
18cd870307
Fix travis 2020-10-03 22:31:55 +02:00
jove@bisquerra.com
017d4946fe NEW: TakePOS Multicurrency compatibility 2020-10-03 22:13:32 +02:00
Laurent Destailleur
cab2c24e27
Merge branch 'develop' into patch-43 2020-10-03 15:51:38 +02:00
Laurent Destailleur
c806ae2654
Merge pull request #14792 from c3do/patch-15 
FIX API Order unlink contact did not work like expected
 2020-10-03 15:30:07 +02:00
Laurent Destailleur
9b3cd421ee Fix doc 2020-10-03 14:56:04 +02:00
Laurent Destailleur
f764b36a64 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-03 14:53:22 +02:00
Laurent Destailleur
f217959740 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-03 14:51:30 +02:00
Laurent Destailleur
ca0dcb4db0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_supplier_orders.php
 2020-10-03 14:51:18 +02:00
Laurent Destailleur
5ed7b43214 phpcs 2020-10-03 14:48:19 +02:00
Laurent Destailleur
9e48920e1d
Merge pull request #14902 from ptibogxiv/patch-368 
Fix multicompany in order box
 2020-10-03 14:15:11 +02:00
Laurent Destailleur
ae16b45a5b
Merge pull request #14900 from frederic34/patch-4 
use create instead edit on create contract
 2020-10-03 14:14:53 +02:00
Laurent Destailleur
08afb586f8
Merge pull request #14903 from ptibogxiv/patch-369 
Fix multicompany in propal box
 2020-10-03 14:13:29 +02:00
Laurent Destailleur
71ab4c4a70
Merge pull request #14905 from ptibogxiv/patch-371 
Fix multicompany in supplier order awaiting box
 2020-10-03 14:12:57 +02:00
Laurent Destailleur
3b34c496cc Code 2020-10-03 14:11:47 +02:00
ptibogxiv
af2bd76500
Fix multicompany in shipment box 2020-10-03 14:06:33 +02:00
ptibogxiv
69660d1a9d
Update box_supplier_orders.php 2020-10-03 14:02:59 +02:00
Laurent Destailleur
581a3d8808 FIX Add a better message when file size is too large 2020-10-03 14:02:53 +02:00
ptibogxiv
331db5e367
Fix multicompany in supplier order awaiting box 2020-10-03 14:01:46 +02:00
ptibogxiv
26a2fea8c7
Fix multicompany in supplier order box 2020-10-03 14:00:23 +02:00
ptibogxiv
e9c101349b
Fix multicompany in propal box 2020-10-03 13:57:37 +02:00
ptibogxiv
3840d6c0a7
Fix entity in ordre box 2020-10-03 13:52:52 +02:00
Laurent Destailleur
3de6fd8918 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-03 11:32:40 +02:00
Laurent Destailleur
272b98faab FIX #14901 2020-10-03 11:31:56 +02:00
Laurent Destailleur
1c34868028 Fix field must be null because there is no numbering ref module yet 2020-10-03 11:16:31 +02:00
Frédéric FRANCE
711339945c
use create instead edit on create contract 2020-10-02 21:41:05 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Laurent Destailleur
50ca9f4145 Clean code 2020-10-02 19:10:30 +02:00
Laurent Destailleur
1a535dc77b Clean code 2020-10-02 19:00:15 +02:00
Laurent Destailleur
e7ce888cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 16:15:38 +02:00
Laurent Destailleur
03ede71989 Clean code 2020-10-02 16:15:24 +02:00
Laurent Destailleur
b90f912099
Merge pull request #14898 from bb2a/Droit-for-Download-vcad-user 
Restric for download vcar user
 2020-10-02 15:43:07 +02:00
Laurent Destailleur
b15d862f36
Merge pull request #14870 from atm-john/12.0_add_filters_on_tab_soc_price 
ADD : Filters more filters on customer price tab
 2020-10-02 15:40:52 +02:00
Anthony Berton
533fdda848 Update vcard.php 2020-10-02 15:11:02 +02:00
stickler-ci
2ea6c092a4 Fixing style errors. 2020-10-02 13:05:50 +00:00
Laurent Destailleur
bede4040f6
Update productcustomerprice.class.php 2020-10-02 15:04:03 +02:00
Laurent Destailleur
331f751905
Merge pull request #14866 from defrance/patch-156 
NEW add two hooks printFieldListFrom and printFieldSearchParam
 2020-10-02 15:01:12 +02:00
Laurent Destailleur
9ea7e26458 Complete #14866 2020-10-02 15:00:39 +02:00
Laurent Destailleur
31710479dc
Update list.php 2020-10-02 14:59:18 +02:00
Laurent Destailleur
399258cc86
Update list.php 2020-10-02 14:55:02 +02:00
Laurent Destailleur
5cf738381f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 14:45:29 +02:00
Laurent Destailleur
d482594499 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 14:45:20 +02:00
Laurent Destailleur
88714cfb18 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-02 14:44:23 +02:00
Laurent Destailleur
cee28d0253 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-02 14:43:54 +02:00
Laurent Destailleur
cdc9d3dd1b
Merge pull request #14480 from OPEN-DSI/v10-fix-objectline-edit-tpl-margins-rates 
FIX update margins rates on object line edit
 2020-10-02 14:43:13 +02:00
Laurent Destailleur
500ef243e2
Merge pull request #14815 from ptibogxiv/patch-365 
NEW restrict thirdparty to customer in takepos
 2020-10-02 14:41:11 +02:00
Laurent Destailleur
954a6b5b3b CSS 2020-10-02 14:26:16 +02:00
Laurent Destailleur
bc308fc662 Look and feel v13 - Disabled users are greyed 2020-10-02 14:19:44 +02:00
Laurent Destailleur
5256229089 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-02 13:51:47 +02:00
Laurent Destailleur
10deb1baad Clean code - Removed no more used files orderstoinvoice.php 2020-10-02 13:51:32 +02:00
Laurent Destailleur
230edd5b67
Merge pull request #14890 from inoveaconseil/NEWHookPropalcard 
New hook propalcard
 2020-10-02 13:46:53 +02:00
Laurent Destailleur
d297e0b05a
Update card.php 2020-10-02 13:46:44 +02:00
Laurent Destailleur
00cb3277ec
Merge pull request #14891 from inoveaconseil/Newhidelabelvariant 
NEW hide label in pdf for variants
 2020-10-02 13:45:52 +02:00
Laurent Destailleur
7e414fe9da
Merge pull request #14889 from frederic34/ecm_extrafields 
NEW Add extrafields support on ECM module
 2020-10-02 13:44:45 +02:00
Laurent Destailleur
193c9ac803
Merge pull request #14892 from atm-john/develop_new_search_param_for_order_close_date 
NEW Add search param for close date on order list
 2020-10-02 13:42:02 +02:00
Laurent Destailleur
440ad2035e
Merge pull request #14893 from FHenry/develop 
Add missing lang file (if order is billed the status icon "billed" is not translated
 2020-10-02 13:41:23 +02:00
Laurent Destailleur
3c6fcced8e Clean code 2020-10-02 13:38:35 +02:00
Laurent Destailleur
86c9c28e7c
Merge pull request #14895 from hregis/12.0_ldap 
FIX missing hook 'formConfirm' in 'addreplace' $hooktype
 2020-10-02 13:33:35 +02:00
Regis Houssin
f67189aaa8 FIX missing hook 'formConfirm' in 'addreplace' $hooktype 2020-10-02 13:16:42 +02:00
Laurent Destailleur
0893f0250a Minor bug fixes 2020-10-02 12:54:56 +02:00
Florian HENRY
18c946dc75 add missing translation 2020-10-02 10:37:02 +02:00
Florian HENRY
1bbd4da0fe add missing translation 2020-10-02 10:36:16 +02:00
stickler-ci
a7b4f0ec49 Fixing style errors. 2020-10-02 07:43:29 +00:00
John Botella
f31e689480 Fix new look and feel 2020-10-02 09:39:54 +02:00
Nicolas
9e4e027495 Hide label 2020-10-02 09:39:42 +02:00
Nicolas
85dfb5bf3c Hide the label into pdf document for variants 2020-10-02 09:27:01 +02:00
Nicolas
e72fbbfe17 Hide the label into pdf document for variants 2020-10-02 09:21:44 +02:00
John Botella
ac7a747004 Merge branch '12.0_new_search_param_for_order_close_date' into develop 2020-10-02 09:19:25 +02:00
stickler-ci
4707ea2a27 Fixing style errors. 2020-10-02 06:48:14 +00:00
Nicolas
d976d474df NEW Hook on propal card 2020-10-02 08:42:48 +02:00
Laurent Destailleur
ce0fa53cb0 Fix delete of file from file manager 2020-10-02 03:07:31 +02:00
Laurent Destailleur
4e49461143 code comment 2020-10-02 02:11:04 +02:00
Laurent Destailleur
e1d156973b phpcs 2020-10-02 02:08:04 +02:00
Laurent Destailleur
813deee4a5 Fix phpcs 2020-10-02 01:14:43 +02:00
Frédéric FRANCE
16ff15b48c
fix 2020-10-02 00:29:36 +02:00
Frédéric FRANCE
b78e506e39
add files 2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
Laurent Destailleur
8d08290f21 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-01 19:38:11 +02:00
Laurent Destailleur
0fa139f4e3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-10-01 19:37:56 +02:00
Laurent Destailleur
4d134ade72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-10-01 19:35:49 +02:00
Laurent Destailleur
14736bee63
Merge pull request #14852 from inovea-conseil/newfieldwebsite 
NEW website page fields
 2020-10-01 19:31:14 +02:00
Laurent Destailleur
ab68d3febe
Merge pull request #14864 from aspangaro/13a20 
FIX If salaries subledger account not defined, put only in the general account
 2020-10-01 19:29:29 +02:00
Laurent Destailleur
a0722f2a30
Merge pull request #14862 from TobiasSekan/UseObjectFieldsOnContactList 
NEW Use object field of contact in contact list (internal)
 2020-10-01 19:27:49 +02:00
Laurent Destailleur
04bad37564
Merge pull request #14858 from TobiasSekan/UseObjectFieldsOnProjectList 
NEW Use object field of project in project list (internal)
 2020-10-01 19:26:42 +02:00
Laurent Destailleur
ed69b6ad15
Merge pull request #14863 from bomuux/patch-2 
Bug: ActionComm::ref_ext is not saved properly
 2020-10-01 19:21:28 +02:00
Laurent Destailleur
445e0971ac
Merge pull request #14871 from davidNDU/develop 
FIX #13979 Module builder: pdf_standard_myobject.modules.php changed specific code (Facture::STATUS_DRAFT), myboject.class.php added $last_main_doc
 2020-10-01 19:20:15 +02:00
Laurent Destailleur
f79bce638a
Merge pull request #14872 from FHenry/develop 
fix remove php warning non-numeric value
 2020-10-01 19:18:11 +02:00
Laurent Destailleur
0ef182216f
Merge pull request #14875 from ptibogxiv/patch-366 
FIX date and user cloture / closing display
 2020-10-01 19:15:46 +02:00
Laurent Destailleur
89dfb9baf8
Merge pull request #14887 from cfoellmann/fix-origin-user 
handle fk_origin for stock movement for users the core way
 2020-10-01 19:15:01 +02:00
Laurent Destailleur
26be972b71
Merge pull request #14874 from defrance/patch-157 
fix typo error
 2020-10-01 19:12:53 +02:00
Laurent Destailleur
580df3d503
Merge pull request #14880 from rabib-metroworks/import-proposal 
NEW Can import proposals
 2020-10-01 19:09:14 +02:00
Laurent Destailleur
d912908aef NEW Can build vendor invoice from vendor orders 2020-10-01 19:05:20 +02:00
Laurent Destailleur
ece8037f42 The button "Invoice orders" switch to page with lines autoselected. 2020-10-01 18:08:46 +02:00
Florian HENRY
2f5a2d0e28 fix CSRF not provided 2020-10-01 17:42:04 +02:00
Laurent Destailleur
f15ee475f1
Merge pull request #14882 from atm-john/12.0_fix_default_values_and_sended_values 
FIX default accountancy values and posted values
 2020-10-01 17:06:08 +02:00
Laurent Destailleur
58de8c9149 Close #14885 Merge manualy the PR to solve a conflict. 2020-10-01 17:04:24 +02:00
Laurent Destailleur
f5f2ea57e3 Fix compatibility 2020-10-01 16:57:49 +02:00
Laurent Destailleur
a2efdee865 Fix after regression of #14886 2020-10-01 16:49:27 +02:00
Laurent Destailleur
2f89d526eb Avoid to get a random result. 2020-10-01 16:43:56 +02:00
Laurent Destailleur
8bfc2bed3e Fix navigation into user list 2020-10-01 16:27:17 +02:00
Laurent Destailleur
b258a848e2 NEW Can enable/disable users in bulk actions 2020-10-01 16:21:07 +02:00
Florian
c89f8b323b Rename fk_typeobject to type_object 2020-10-01 15:18:19 +02:00
Christian Foellmann
a890b2d7ad handle fk_origin for stock movement for users the core way 2020-10-01 12:31:00 +02:00
ptibogxiv
4e16db1e5f
Update paymentmodes.php 2020-10-01 12:22:53 +02:00
ptibogxiv
3f78d8fe25
Update stripe.class.php 2020-10-01 12:19:12 +02:00
ptibogxiv
676d70d86d
FIX stripe for connect mode 2020-10-01 12:14:50 +02:00
Laurent Destailleur
298e94e574 Typo 2020-10-01 11:16:43 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
9447eb2873 Typo 2020-10-01 09:50:09 +02:00
stickler-ci
e558dc3f27 Fixing style errors. 2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e FIX default accountancy values and posted values 2020-10-01 09:40:11 +02:00
Laurent Destailleur
75ff2eb642 Typo 2020-10-01 09:39:18 +02:00
Laurent Destailleur
91f0429bd2 Fix mention for france, only for FR country 2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib
0b35a07290 NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE 
Added proposal import functionality in import module
 2020-10-01 11:52:56 +06:00
Laurent Destailleur
3f1c9999db urlencode 2020-09-30 18:44:26 +02:00
Laurent Destailleur
1690468da5 Fix delete of profiles 2020-09-30 18:39:23 +02:00
stickler-ci
e14c971b69 Fixing style errors. 2020-09-30 13:29:20 +00:00
ptibogxiv
9624a33e53
FIX date and user cloture / closing display 
temporary fix while convert french to english term in dolibarr
 2020-09-30 15:27:16 +02:00
John Botella
afbe5f6017 Add search param for close date 2020-09-30 15:26:13 +02:00
BENKE Charlene
8ab627e768
fix typo error 2020-09-30 15:17:44 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
lvessiller
259737f082 FIX set paid on total discount of a product in cash desk 2020-09-30 15:09:45 +02:00
stickler-ci
fd8e7fdfe3 Fixing style errors. 2020-09-30 12:57:36 +00:00
Sekan, Tobias
27c90abc0b address feedback 2020-09-30 14:54:24 +02:00
Florian HENRY
4602ffa990 Merge github.com:Dolibarr/dolibarr into develop 2020-09-30 13:53:42 +02:00
Florian HENRY
6b539dfad0 fix remove php warning non-numeric value 2020-09-30 13:53:27 +02:00
davidNDU
3187c38ba3 Add object Methods with module builder, add/modify user rights and left side menu 2020-09-30 14:37:47 +03:00
John Botella
1131eb240d Fix lang trans 2020-09-30 13:36:03 +02:00
geoffrey.girard
8c017ad422 ADD : Filters more filters on customer price tab 2020-09-30 13:33:05 +02:00
Laurent Destailleur
805f06fe31 Add token for GET on page to setup journal. 2020-09-30 12:54:05 +02:00
Laurent Destailleur
a3da2afe7a Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES 2020-09-30 11:58:40 +02:00
Sekan, Tobias
8d2cd144ce fix removed fields 2020-09-30 11:52:22 +02:00
Sekan, Tobias
6c46b2e8de Address feedback 2020-09-30 11:45:29 +02:00
BENKE Charlene
10f8ccd7ed
New : add two hook for more feature on list 
New hook are : 
printFieldListTable : allow to add more table on sql query (from another modules)
printFieldListSearchParam : allow to keep search on new filter

If ok, i add it on all native list
 2020-09-30 10:55:55 +02:00
Alexandre SPANGARO
ed26f07783 FIX If salaries subledger account not defined, put only in the general account 2020-09-30 06:46:23 +02:00
Alexandre SPANGARO
fc62ca57b5 Remove old code 2020-09-30 06:37:48 +02:00
Laurent Destailleur
f063a144c1 NEW Can add event to log into blockedlog module with a constant. 2020-09-29 21:51:39 +02:00
Laurent Destailleur
1e176fad8f Fix GETPOST on array 2020-09-29 21:28:07 +02:00
Laurent Destailleur
879d041398 Can force the typeof check of GETPOST into $fields for type text. 2020-09-29 20:48:40 +02:00
Laurent Destailleur
82da38df65 Removed dead code 2020-09-29 19:57:10 +02:00
bomuux
9ed6092ed8
Bug: ActionComm::ref_ext is not saved properly 
ActionComm::ref_ext is considered to be a timestamp in ActionComm::create(), (but not in ActionComm::create()).
Correction to consider it a string.
 2020-09-29 19:56:22 +02:00
ptibogxiv
09f7220470
Update index.php 2020-09-29 17:10:08 +02:00
ptibogxiv
8bef390d60
Update list.php 2020-09-29 17:09:45 +02:00
Laurent Destailleur
ac897b5b4d Fix css 2020-09-29 17:06:08 +02:00
Laurent Destailleur
e86bbe346a
Merge pull request #14837 from andreubisquerra/master 
NEW: Introducing new modal boxes in TakePOS
 2020-09-29 16:51:48 +02:00
Laurent Destailleur
fba8fdae6e
Merge pull request #14856 from bafbes/abb120146 
new:bankline_prepare_head for bank lines
 2020-09-29 16:40:51 +02:00
Laurent Destailleur
babcc3bc91
Update line.php 2020-09-29 16:39:47 +02:00
stickler-ci
ce8d240d8f Fixing style errors. 2020-09-29 13:06:23 +00:00
Sekan, Tobias
c8e11f9eae Use object fileds on contact list 2020-09-29 14:59:16 +02:00
Laurent Destailleur
708ac91a39
Merge pull request #14825 from atm-greg/fix_notification_system 
Fix notification system
 2020-09-29 14:13:33 +02:00
Laurent Destailleur
14e6d38fe8
Merge pull request #14860 from Tim-Otte/fix-missing-styles-in-lines 
FIX: Added support for styling in lines in odt documents
 2020-09-29 14:11:25 +02:00
atm-greg
a61f79c039 only update reminders if event is not past 2020-09-29 14:10:24 +02:00
atm-greg
1ed6312f4b add modification of the notifications 2020-09-29 14:08:49 +02:00
Laurent Destailleur
e08d7254e2
Merge pull request #14849 from aspangaro/13a20 
NEW Add column vat rate in page to define accounting account on product/service
 2020-09-29 14:02:39 +02:00
Laurent Destailleur
4e93fb1e5e
Merge pull request #14853 from c3do/patch-16 
Fix API $includeparentid when get product
 2020-09-29 13:34:42 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
29414251f5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2020-09-29 13:19:03 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +02:00
Tim Otte
82b3b5612d
Update extrafields.class.php 
That change should not be included in the PR
 2020-09-29 12:19:19 +02:00
Tim Otte
3e612d2a94 Added support for styling in lines 2020-09-29 12:13:41 +02:00
Sekan, Tobias
c0a3aa2b5b add mising elements from last commit 2020-09-29 12:00:54 +02:00
Sekan, Tobias
2d4e2ee378 Use object field for list fields (project) 2020-09-29 10:00:14 +02:00
Alexandre SPANGARO
d8cad89dee Merge remote-tracking branch 'upstream/develop' into 13a20 2020-09-29 04:55:33 +02:00
bahfir abbes
9662c4110a new:bankline_prepare_head for bank lines 2020-09-29 01:28:39 +01:00
Laurent Destailleur
a6dcf5f1c1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-29 00:51:02 +02:00