lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,662 Commits 43 Branches 150 Tags 886 MiB
10.0
Commit Graph

292 Commits

Author SHA1 Message Date
Laurent Destailleur
25fa729e4e NEW Add the now link when creating expense report 2019-03-07 14:32:03 +01:00
Laurent Destailleur
31e1ad48e3 css 2019-03-07 14:28:09 +01:00
Laurent Destailleur
b9408baef3 Fix if price net was not saved, we recalculate it at output 2019-03-07 14:27:20 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
96d4e28473 FIX Vat src code lost after editing expense report line 2019-03-07 11:08:01 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-12-17 18:50:06 +01:00
Laurent Destailleur
17b2fd295f FIX Css of amount on remain to pay on expense report 2018-12-17 13:57:30 +01:00
Laurent Destailleur
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
1979e3238c Fix rounding 2018-12-17 10:42:30 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Frédéric FRANCE
61322b9ce2
devcamp 2018 fix #9642 2018-12-01 16:19:54 +01:00
IJ
db719dbcbb
FIX: Display All Types of Payments on Expense Report Card 
Fixes #9991 - Bug: 7.0.4: Expense Report Payment Type Not Displayed 
- without this fix, only cash type accounts were shown when payment was made
 2018-11-25 20:36:25 +00:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
dfb20c705e NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE 2018-10-31 16:05:50 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
5daf095fc6 FIX Title and content of automatic email of expense report 2018-10-25 14:05:22 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
38df6ac27b
remove deprecated form_confirm 2018-10-22 21:57:18 +02:00
Laurent Destailleur
e2f450aa8c Fix regession losing description. 
Rename updateligne into updateline.
 2018-09-28 16:15:17 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
4a7ea33008
replace select_date 2018-09-09 08:02:26 +02:00
Philippe GRAND
ccabd2b859 Uniformize 2018-08-02 14:03:50 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Laurent Destailleur
d9fc1e0b5d Fix param to avoid to create holiday or expense report in wrong entity. 2018-06-25 10:09:01 +02:00
Frédéric FRANCE
f5605bdd7d
loadlangs 2018-05-26 20:51:17 +02:00
Laurent Destailleur
9315d9c423 NEW Introduce permission "approve" for "leave request" like for "expense 
report"
 2018-05-10 18:56:21 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
fdfcb96176 Fix length of combobox 2018-03-29 15:31:21 +02:00
Laurent Destailleur
d1e9a4719b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2018-03-27 12:27:15 +02:00
Laurent Destailleur
89bf781fe6 FIX Add warning when expense report line not into range 
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
 2018-03-26 14:13:40 +02:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
ee3dcb724f FIX email use the validate user instead of approver in holiday approval 
email.
 2018-03-19 17:20:44 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
3911738b88 Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 18:40:45 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Laurent Destailleur
241b5e9a93 FIX security report DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 15:52:11 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
0a79550f43 Fix oldcopy must be saved before update_extras 2018-02-23 16:11:00 +01:00
Laurent Destailleur
b42193b9ea Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-23 15:34:24 +01:00
Laurent Destailleur
953001c7ab Fix bad naming of column 2018-02-23 15:16:49 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra. 
Clean duplicate trigggers "*_CLONE"
 2018-02-20 18:09:38 +01:00
Laurent Destailleur
510fc22172 Fix expense report 2018-02-07 17:01:14 +01:00
Laurent Destailleur
8dd7d69294 Fix commit 2018-02-07 16:04:31 +01:00
Laurent Destailleur
d8872a412b Fix numbering for expense report 2018-02-07 15:52:57 +01:00
Laurent Destailleur
8352aee9f7 NEW Add option EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS 2017-11-26 00:14:54 +01:00
Laurent Destailleur
39d00b2ea9 Standardize code 2017-11-23 15:24:25 +01:00
Laurent Destailleur
9bc6acdf0e Fix syntax error 2017-11-23 15:23:45 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
BENKE Charlene
0553e331fe
Update card.php 
Normalize link and generate document
 2017-11-14 08:48:41 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
36b4d50cff FIX #7737 2017-11-12 20:41:25 +01:00
Laurent Destailleur
f24204c79a Error management after extrafield update 2017-10-24 19:04:40 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Regis Houssin
8e8f94df11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture-rec.class.php
 2017-08-30 19:33:23 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Regis Houssin
ad39c30c21 Fix: change old email 2017-08-23 21:23:18 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-22 18:49:40 +02:00
Laurent Destailleur
b3d1cdf84c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-08-22 10:11:32 +02:00
Laurent Destailleur
e647b5562b Fix hidden option EXPENSEREPORT_LINES_SORTED_BY_ROWID to restore 
compatibility.
 2017-08-21 23:41:32 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +02:00
Laurent Destailleur
f32b27e8bd Better management of vat with code 2017-07-08 18:50:58 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
ba3b6b6aa5 Better support of vat with code in expense report 2017-07-08 18:09:45 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Regis Houssin
fa247ffd98 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-29 08:51:42 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Regis Houssin
cc75916599 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00