Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

1703 Commits

Author SHA1 Message Date
Laurent Destailleur
52d1f57276 Merge pull request #14828 from TobiasSekan/NewAllowReopenIntervention 
NEW Allow to reopen interventions (green button)
 2020-09-27 17:07:45 +02:00
Laurent Destailleur
164af8bdea Merge pull request #14829 from TobiasSekan/NewShowLineNumberOnInterventionCard 
NEW Show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
 2020-09-27 16:58:08 +02:00
root
fcbc48fa28 Bug fix last_gen should be date_last_gen 2020-09-25 14:24:26 +02:00
Sekan, Tobias
4210a2cfa1 New Show line number on intervention card 2020-09-25 08:25:24 +02:00
stickler-ci
6e2d12413c Fixing style errors. 2020-09-25 06:17:52 +00:00
Sekan, Tobias
00951a8144 New allow to reopen interventions 2020-09-25 08:10:48 +02:00
stickler-ci
efd8ffe390 Fixing style errors. 2020-09-24 11:29:30 +00:00
Sekan, Tobias
56dd28ca78 fix wrong color 2020-09-24 13:25:40 +02:00
Sekan, Tobias
3c879ddd34 Fix unbeautiful error message on intervention 2020-09-24 13:15:51 +02:00
Laurent Destailleur
6f919f1dd0 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 20:02:48 +02:00
Sekan, Tobias
16e23797da Fix not working global search on fichinter by desc 2020-09-23 09:51:16 +02:00
Tobias Sekan
a72519f353 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Pascal Hubrecht
6d7f5ef0a8 Fix label inversion 
Private and public labels where inverted.
 2020-09-22 12:40:26 +02:00
Laurent Destailleur
f57b4fd2fd Fix escaping 2020-09-20 02:30:53 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
1b04ef8aad Add function to all list that support $socid 2020-09-18 10:36:40 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
0bf0312d50 FIX #yogosha4448 2020-09-17 12:30:14 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +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
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
8a9244d1d6 Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions 
NEW - Show references in contract form on interventions
 2020-08-27 19:44:51 +02:00
Sekan, Tobias
c2590433fe Show ref in contract form on interventions 2020-08-27 10:11:18 +02:00
Laurent Destailleur
b80ba1179f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/expensereport/lines.php
	htdocs/accountancy/supplier/lines.php
 2020-08-21 13:19:28 +02:00
Laurent Destailleur
b6af947042 Fix phpcs 2020-08-21 13:06:54 +02:00
Laurent Destailleur
afe8f76a4a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/stock.php
 2020-08-18 15:41:57 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Juanjo Menent
e685a96716 FIX: Intervention lose html tags when updating 2020-08-18 13:44:50 +02:00
Laurent Destailleur
cab9f6daae Comment must be in english 2020-08-08 13:22:55 +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
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
6123596ec9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fichinter/list.php
 2020-05-31 00:28:40 +02:00
Laurent Destailleur
e223189507 FIX #14002 2020-05-30 14:20:04 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00