lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,547 Commits 43 Branches 150 Tags 886 MiB
3d3a7bfd37
Commit Graph

1893 Commits

Author SHA1 Message Date
Laurent Destailleur
bb10379768 NEW Can change a product in line of recurring invoice or contract 2020-09-23 18:45:19 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
f62d52f89a Fix tooltip for linkto object. 
Fix security of ajax selectobject.php
 2020-09-19 00:44:47 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
7a28972c8a FIX sign of amount of invoice lines for credit note with multicurrency 
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
 2020-09-15 11:18:21 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Laurent Destailleur
7ca9fd9dce Fix merge 2020-09-14 03:49:31 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
23cda5f464 Enhance recruitment module 2020-08-22 14:37:09 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Laurent Destailleur
c407a19563 Remove type= from script tags 2020-08-16 22:03:11 +02:00
Laurent Destailleur
73c1184195 Fix phpcs 2020-08-14 13:23:41 +02:00
Laurent Destailleur
d8c6e17efd Fix travis 2020-08-14 11:59:51 +02:00
lvessiller
39a422ef94 FIX update margins rates on object line edit 2020-08-14 11:48:53 +02:00
Laurent Destailleur
a2f50770f8
Merge pull request #14449 from cfoellmann/default-unit 
set default unit to `PRODUCT_USE_UNITS` value
 2020-08-14 03:04:09 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates 
NEW: new line template: hidden conf to fill service dates from the last service line
 2020-08-14 02:50:24 +02:00
stickler-ci
ef78b85062 Fixing style errors. 2020-08-11 10:42:27 +00:00
John Botella
47e664df8d Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates 2020-08-11 12:28:40 +02:00
stickler-ci
3e168f9495 Fixing style errors. 2020-08-10 14:06:22 +00:00
Christian Foellmann
821e7e2894 set default unit to PRODUCT_USE_UNITS value 2020-08-10 15:39:05 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
39a5583930 FIX #14146 2020-08-04 13:32:26 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
618c85ceb1 FIX Filter too large for extrafields with type text or html 2020-07-30 14:49:31 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
6d8060bc50 FIX DO not erase variable $key and $label during output of extrafields 
Conflicts:
	htdocs/core/tpl/extrafields_view.tpl.php
 2020-07-27 14:22:55 +02:00
Laurent Destailleur
10484ba06e FIX DO not erase variable $key and $label during output of extrafields 2020-07-27 14:04:41 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php 
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
 2020-07-22 11:44:26 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
cb5577826d Look and feel v13 2020-07-07 03:50:14 +02:00
Laurent Destailleur
14c98f277b NEW Can change VAT rate of all lines of a draft object in one step. 2020-07-06 22:48:22 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY 
Fix setup of product
 2020-07-06 15:34:26 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
2865d6bd15 Fix set of free product 2020-06-24 13:39:00 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
florian HENRY
7fef9a813e fix warning and clean old code about multiselect category 2020-06-18 20:03:03 +02:00
Laurent Destailleur
1736ecfa26 Fix phpcs 2020-06-15 04:32:59 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
3831b56423 Missing tags 2020-06-11 17:07:41 +02:00
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174 Fix for use with text browser 2020-06-10 12:35:39 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
bahfir abbes
cb551cfd5a fix:non editable fields must not be editable in creation either 2020-06-01 20:58:20 +02:00
bahfir abbes
26f280b74b fix:non editable fields must not be editable in creation either 2020-05-31 01:33:34 +01:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Frédéric FRANCE
726d7817c4
add new rule 2020-05-21 16:13:46 +02:00
Frédéric FRANCE
5940d3705a
add new rule 2020-05-21 16:00:12 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
 2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
 2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
Laurent Destailleur
6c8d302dd9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/list.php
	htdocs/compta/prelevement/rejets.php
	htdocs/fourn/commande/index.php
 2020-05-07 12:03:49 +02:00
Laurent Destailleur
1ec8b31e46 Fix remove action param in url to allow a second try without the error 
message
 2020-05-06 15:15:12 +02:00
Maxime Kohlhaas
e0ebe85c13 Fix addline titles 2020-05-03 09:15:12 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2020-04-30 18:49:20 +02:00
Laurent Destailleur
91523b4b64 FIX Can switch from double to price type for extrafields 
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
 2020-04-28 14:27:22 +02:00
Laurent Destailleur
7a73915e92 FIX Can switch from double to price type for extrafields 2020-04-28 14:22:13 +02:00
Laurent Destailleur
635b9bb0fe FIX #13641 2020-04-27 15:27:03 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
gauthier
e98671e404 FIX : Access to undeclared static property: Contact::$table_element 2020-04-24 15:22:38 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
1ef89eb1a1 Fix $mysoc global not loaded. 2020-04-21 14:14:49 +02:00
Laurent Destailleur
8f7c3fc867 Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive) 2020-04-18 14:39:02 +02:00
Laurent Destailleur
b0515c626b Look and feel v12 2020-04-18 00:09:24 +02:00
Laurent Destailleur
803b0eb3bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 12:39:45 +02:00
Laurent Destailleur
dd50083a81 Look and feel v12 2020-04-16 12:39:34 +02:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-15 22:42:57 +00:00
Laurent Destailleur
95cf8b6359 FIX Non expected switch from tab timesptent to tab tasks 2020-04-15 14:54:54 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
18f2087cc6 Fix look and feel v12 2020-04-08 15:13:01 +02:00
Laurent Destailleur
d257b5553e
Merge pull request #13351 from TobiasSekan/FixErrorAndSortingInContactView 
FIX error and sorting in contact view
 2020-04-08 15:03:37 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
165df931f1 Complete fix #13491 2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4 
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
 2020-04-05 02:54:41 +02:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-05 00:44:59 +00:00
Laurent Destailleur
28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-03 18:07:24 +02:00
atm-lena
bc0d98b91c FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation 2020-04-03 14:24:59 +02:00
Laurent Destailleur
f7b6895dc6 Fix option to not generate doc in modulebuilder. 2020-04-03 14:02:37 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
florian HENRY
5658d783d6 fix advtargetemailing : fatal call to static attribut (that is not static: table_element) 2020-03-31 12:04:34 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields 
NEW : Project task list, add column selector and extrafields
 2020-03-30 18:53:42 +02:00
Laurent Destailleur
5fad4c8cb4 CSS 2020-03-29 19:41:01 +02:00
florian HENRY
21b98a7c4c set as global 2020-03-26 08:24:20 +01:00
Laurent Destailleur
fca6d45baa NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks 
instead.
 2020-03-19 10:15:34 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
 2020-03-18 18:50:55 +01:00
Laurent Destailleur
a3328c5ef3 Fix div 2020-03-18 18:37:44 +01:00
Tobias Sekan
79caae9123
fix wrongly remoived center attributes 2020-03-16 09:59:58 +01:00
stickler-ci
711aff9ff7 Fixing style errors. 2020-03-16 08:56:10 +00:00
Tobias Sekan
41c0575a5d
Fix not working sorting in contact view 2020-03-16 09:51:12 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou 
Fix preselected value on contact
 2020-03-14 14:45:37 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
ad22820872 FIX #13313 2020-03-12 12:15:44 +01:00
Laurent Destailleur
e7ce9c16cb FIX #13313 2020-03-12 12:15:16 +01:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 
NEW : Allow extrafields on pdf : extend to line desc
 2020-03-11 17:12:14 +01:00
Laurent Destailleur
2b8a06cb5e FIX unit price for selected supplier products not set. NaN was used. 2020-03-11 16:12:34 +01:00
Laurent Destailleur
5adec1fe32 FIX unit price for selected supplier products not set. NaN was used. 2020-03-11 16:11:38 +01:00
Laurent Destailleur
1f5c8f682c FIX cols parameter not propagated to tpl 2020-03-10 21:55:29 +01:00
Laurent Destailleur
d956222e36 FIX cols parameter not propagated to tpl 2020-03-10 21:54:50 +01:00
Laurent Destailleur
dc0e96a6e5 Fix scrutinizer 2020-03-06 14:09:00 +01:00
Laurent Destailleur
f35f0ecf9d Look and feel v12 2020-03-05 01:54:12 +01:00
Laurent Destailleur
45bcd1c3bf Code simpler 2020-03-05 01:50:53 +01:00
Laurent Destailleur
c2e5830f9b Fix phpcs 2020-03-05 00:22:51 +01:00
stickler-ci
92cc947623 Fixing style errors. 2020-03-04 12:41:52 +00:00
Tobias Sekan
f823feba52
Add sorting for "Contacts of ..." 2020-03-04 13:31:19 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
5f417039f6 More log to help debug 2020-03-04 00:38:43 +01:00
Laurent Destailleur
f0d458682d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-29 00:15:17 +01:00
Laurent Destailleur
c6b6b97ac0 FIX Free input for email no more visible 2020-02-28 20:25:17 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Laurent Destailleur
9bc5eb44ca FIX #13182 2020-02-26 20:25:26 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
6366881f91 FIX #13175 2020-02-24 00:41:25 +01:00
ATM john
0c2d08cdd9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-23 23:36:43 +01:00
ATM john
5ecef88b35 allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields 2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7 Rename field documentpdf into printable (this field already exists due 
to a very old PR nofinished for same goal).
 2020-02-23 23:03:17 +01:00
ATM john
fe4e00b139 Add new params to extrafields forms to allow extrafields to be displayed on pdf documents 2020-02-23 11:32:38 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
593091f399 FIX etrafield with visibilty=5 were not in read only 
FIX CSS
FIX option for topbar search and bookmarks

Conflicts:
	htdocs/theme/eldy/global.inc.php
 2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9 FIX etrafield with visibilty=5 were not in read only 
FIX CSS
FIX option for topbar search and bookmarks
 2020-02-20 15:25:32 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
 2020-02-20 00:21:25 +01:00
Laurent Destailleur
7c07589850 FIX #13124 2020-02-19 03:07:12 +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
2afe86a1d6 Fix look and feel v11 2020-02-11 19:19:13 +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
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +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
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
ee29c3efdd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 16:02:23 +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
atm-arnaud
bd6d49f04a FIX advanced target emailing sql and ergonomy 2020-02-06 12:08:50 +01:00
Florian Mortgat
eb17a52027 FIX 11.0 - default filtering for extrafields of type 'select' should not use a LIKE "%value%" condition because keys might overlap 2020-02-05 14:57:40 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
c367c6f34e Avoid warning 2020-02-03 21:17:45 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
d13e5bc90b FIX #12875 2020-01-26 23:22:47 +01:00
Laurent Destailleur
3215af9900
Merge pull request #12923 from simicar29/develop 
New: Add Hook doPreMassActions
 2020-01-26 22:32:46 +01:00
Laurent Destailleur
02f8faeeac
Update massactions_pre.tpl.php 2020-01-26 22:32:37 +01:00
Laurent Destailleur
09e707b818 trans 2020-01-25 13:05:40 +01:00
stickler-ci
cfa67b6a5d Fixing style errors. 2020-01-24 08:47:11 +00:00
simicar29
4761671fc8
Add Hook doPreMassActions 
Add Hook doPreMassActions to allow dedicated form display for custom mass actions
 2020-01-24 09:41:22 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
0ebed529e1 FIX #12872 2020-01-17 15:27:43 +01:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
255c280170 Fix visibility 2020-01-09 11:44:15 +01:00
Laurent Destailleur
115b7f2c6b Fix break on second column 2020-01-09 11:05:23 +01:00
Laurent Destailleur
d80764a179 Fix column not visible after switching column when visibility=3 2020-01-07 12:43:05 +01:00
Laurent Destailleur
b98251f7b0 Fix phpcs 2020-01-01 23:14:13 +01:00
Laurent Destailleur
607d013a9d Fix phpcs 2020-01-01 23:01:42 +01:00
Laurent Destailleur
b90dbb585a Fix ident 2020-01-01 22:45:47 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency 
FIX entering predefined product with a forced unit price
 2020-01-01 17:15:26 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Laurent Destailleur
0b73cdb7cc Fix use of currency accuracy 2019-12-11 17:14:32 +01:00
Laurent Destailleur
6ac5e1a4f3
Merge pull request #12601 from TobiasSekan/FixAddFolderSymbolAccess 
Fix style of add folder button based on rights
 2019-12-03 13:46:21 +01:00
Laurent Destailleur
2d95544abd
Update filemanager.tpl.php 2019-12-03 13:46:12 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Tobias Sekan
d7a8fb98fc
Fix style of add folder button based on rights 2019-12-02 13:02:16 +01:00
Laurent Destailleur
d900475c5d
Merge pull request #12571 from inoveaconseil/FIX#12473 
Fix#12473
 2019-12-01 12:42:01 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
558669dd88 Fix #6497 : deposit lines were not translated 2019-11-30 16:14:16 +01:00
stickler-ci
a13b2267aa Fixing style errors. 2019-11-30 14:22:25 +00:00
Nicolas
fd7a18c26f FIX #12473 2019-11-30 12:49:31 +01:00
Laurent Destailleur
58c38912ab Fix action into actionlogin to avoid conflict 2019-11-20 16:42:18 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Laurent Destailleur
545c2207b2 Fix on exact date when we don't know the second is useless 2019-11-13 19:32:27 +01:00
Laurent Destailleur
b9900c20cc
Merge pull request #11035 from atm-ph/new_search_input_on_type_list 
NEW show html list instead input text for extrafields typed as list
 2019-11-13 19:26:19 +01:00
Laurent Destailleur
bdf0219941 Missing link to create contact 
Fix css
 2019-11-13 18:18:45 +01:00
Laurent Destailleur
74239d48bf Fix translation of extrafields when $extralabels not loaded 2019-11-13 11:11:08 +01:00
Laurent Destailleur
dc77a58a73 Work on MO 2019-11-12 01:48:12 +01:00
Laurent Destailleur
03e35623c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470 Fix: Can set savingdocmask by caller. Fix permissions names. 
Fix: Disable crop on svg images.
 2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
038bda254d Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 22:59:36 +00:00
Laurent Destailleur
814dce5b55 Fix var not defined 2019-11-11 19:26:19 +01:00
Laurent Destailleur
6a4ba74ee7 Fix regression introduced by 991e1b2747 2019-11-11 13:17:36 +01:00
Laurent Destailleur
6990732c71 Fix missing action in POST 2019-11-10 13:49:04 +01:00
Laurent Destailleur
6233f8e1c5 Fix visibility = 3 2019-11-09 18:19:04 +01:00
Laurent Destailleur
94fce39562 Fix visibility on modulebuilder 2019-11-09 18:13:59 +01:00
Laurent Destailleur
f11943126a Fix scrutinizer 2019-11-08 09:42:39 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument 
NEW add upload for account statement
 2019-11-07 15:06:47 +01:00
Nicolas
f18bca7687 Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument 2019-11-06 20:51:17 +01:00
Inovea Conseil
fed6ed8760 Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument 2019-11-06 20:48:24 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
stickler-ci
f537ae60b6 Fixing style errors. 2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747 NEW Add upload document on account statement 2019-11-05 13:51:52 +01:00
Laurent Destailleur
7ab19ef66b Fix selection not lose if creation of vendor invoice fails 2019-11-05 13:34:25 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
stickler-ci
8765e7648e Fixing style errors. 2019-10-31 11:03:46 +00:00
atm-ph
526aeab9af Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_search_input_on_type_list 2019-10-31 12:02:53 +01:00
atm-ph
2f68a73a2a New update comments is now available 2019-10-30 15:45:04 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
a8ca8c7a1f Fix edit of extrafields link when empty 2019-10-23 16:38:15 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f Fix responsive and bad closing td 2019-10-23 03:50:48 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
99da69fb69 NEW Can edit the price of predefined product during adding in documents 2019-10-07 21:01:52 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon 
Fix Fa-icon
 2019-10-07 13:03:27 +02:00
Laurent Destailleur
a3d0b9e374 Fix syntax error 2019-10-06 18:11:28 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
76dad97cb1 Fix syntax error 2019-10-06 14:39:43 +02:00
Laurent Destailleur
6743169faa Fix js syntax error 2019-10-06 14:34:24 +02:00