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

1016 Commits

Author SHA1 Message Date
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90 Fix creation/update of expense reports 
Fix export of accounting documents
 2019-12-18 23:07:26 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Alexandre SPANGARO
1fb0d7a0f7 Wrong language file load for dashboard 2019-12-17 22:40:11 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
 2019-12-03 13:52:42 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Maxime Kohlhaas
d76608729b Fix #12569 : update qty on expensereport prevented decimals 2019-12-01 10:50:28 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +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
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
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
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
726f53b337
Merge pull request #12347 from frederic34/patch-8 
add info for tooltip
 2019-11-07 11:23:40 +01:00
Frédéric FRANCE
0e242a3402
add info for tooltip 2019-11-05 21:37:12 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
31936a0ffe
Merge pull request #12304 from frederic34/patch-3 
css
 2019-11-04 20:54:02 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
bdcc33c194
css 2019-11-02 17:36:54 +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
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
8c90c80107 Clean code 2019-11-02 01:30:51 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Laurent Destailleur
e684c1c450 Look and feel v11 2019-11-01 12:11:29 +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
ed9a136211 Fixing style errors. 2019-10-30 08:58:19 +00:00
Philippe GRAND
2fc09b3530 add comment 2019-10-30 09:52:25 +01:00
Laurent Destailleur
c2e630ac49
Merge pull request #12231 from frederic34/patch-14 
make graph bigger and combine small value
 2019-10-30 03:08:13 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:48:11 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:43:35 +01:00
Laurent Destailleur
21d15c3bcb FIX Set unpaid of expense report 2019-10-29 11:35:33 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
64568fc792
Update index.php 2019-10-25 23:23:43 +02:00
Laurent Destailleur
8768c553b1 Debug modulebuilder 2019-10-24 11:16:06 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
7b81ffe3fe
Update list.php 2019-10-11 16:29:16 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Frédéric FRANCE
6bb14bdb0c
Update list.php 2019-10-09 22:07:52 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
76aef85ee4
Merge pull request #12015 from atm-maxime/new_validators 
NEW expense request and holiday validator fields
 2019-10-07 13:31:20 +02:00
Frédéric FRANCE
37f6aa3395
Update list.php 2019-10-06 15:52:33 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
55410a55ef
Update list.php 2019-10-04 00:45:57 +02:00
Laurent Destailleur
02af9b8fa4
Update card.php 2019-10-03 17:56:55 +02:00
Maxime Kohlhaas
6d4f3f308e NEW expense request and holiday validator fields 2019-10-02 08:43:40 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
b3c49f2ec8 End of dev for extrafields on holiday 2019-09-24 16:26:15 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
Laurent Destailleur
bc66be51a8
Update card.php 2019-08-22 11:50:18 +02:00
BENKE Charlene
7f6c29fd65
bad converting on php 7 is totalpaid is null 
display a warning error
 2019-08-19 15:27:21 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Laurent Destailleur
96fb4c52ea Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-10 01:43:52 +02:00
Laurent Destailleur
31fa26c2be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-08-10 01:36:50 +02:00
John Botella
bc0508164b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-06 09:57:49 +02:00
Laurent Destailleur
b294f22285 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-04 13:07:09 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:57 +02:00
Laurent Destailleur
f210e286bd Fix balance of div 2019-08-03 20:53:28 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:18 +02:00
Laurent Destailleur
b40f2cbcce Fix responsive 2019-08-03 20:20:09 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
754ed1b93b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-07-30 22:03:02 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
79bb9d951f Fix phpcs 2019-07-29 01:36:05 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Maxime Kohlhaas
43adb51932 Fix var declaration #11429 2019-07-27 22:06:08 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
4ed7571a3f Merge 2019-07-26 16:36:39 +02:00
Laurent Destailleur
1646f426c5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 16:33:55 +02:00
Laurent Destailleur
471a947e8a FIX Attachment was lost when we validate an expense report 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2019-07-26 16:33:32 +02:00
Laurent Destailleur
97c950badb FIX Attachment was lost when we validate an expense report 2019-07-26 16:30:16 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
be13d5e471 FIX The new feature to attach document on lines was not correclty 
enabled.
 2019-07-23 14:49:09 +02:00
Laurent Destailleur
9ddb8a5b0b Fix tooltip to say closed project are not visibles 2019-07-23 14:41:29 +02:00
Laurent Destailleur
5d1a50bcb4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-20 14:03:18 +02:00
Laurent Destailleur
ac8a776113 FIX Column 'paid' missing in expense report 2019-07-20 14:02:53 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
9c54de57ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-23 18:12:56 +02:00
Laurent Destailleur
a6fc75fed2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
 2019-06-23 18:12:30 +02:00
Laurent Destailleur
0854984a08 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-06-23 18:09:49 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
 2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
81bca34a08 FIX A user may read holiday and expense report without permissions 2019-06-18 16:04:25 +02:00
Laurent Destailleur
6e9874b95a FIX A user may read holiday and expense report without permissions 2019-06-18 16:01:24 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
5539b07bc5 Fix missing title 2019-05-28 12:15:30 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
 2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
3a99ef7319 Fix: missing GETPOST params 2019-05-11 17:04:05 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
72025f6d5d Fix CSS 2019-04-23 15:54:24 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
8d18915746 Work on edit link of expense report line and files 2019-04-12 18:18:04 +02:00
Laurent Destailleur
6b4dbc80e5 Fix phpcs 2019-04-10 21:25:37 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
917b9d69fa Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and 
not recommanded to use in Dolibarr.
 2019-04-08 14:55:31 +02:00
Laurent Destailleur
0fd1f9abf6 Show if there is no uploaded files 2019-04-05 19:39:30 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
fbc56d8413 WIP Preview pdf on expense report line 2019-03-24 20:37:57 +01:00
Laurent Destailleur
335af2f458 WIP Attach document to expense report lines 2019-03-24 20:33:00 +01:00
Laurent Destailleur
a950d8389e WIP Attach document to expense report lines 2019-03-24 20:22:05 +01:00
Laurent Destailleur
3578c7cb0a Fix phpcs 2019-03-24 18:20:56 +01:00
Laurent Destailleur
41223702d7 Use radio button to select file on expense report line 2019-03-24 15:02:53 +01:00
Laurent Destailleur
fad6efd86c WIP file attachment on expense report lines 2019-03-24 13:27:26 +01:00
Laurent Destailleur
5ff76e2c13 WIP file attachment on expense report lines 2019-03-24 12:15:19 +01:00
Laurent Destailleur
b54b687464 FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:05:07 +01:00
Laurent Destailleur
a0206d554e FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:04:32 +01:00
Laurent Destailleur
c569e71bc8 Fix remove warnings 2019-03-23 12:04:50 +01:00
Laurent Destailleur
aab9734f52 WIP Save link to file in expensereport lines 2019-03-22 18:03:08 +01:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
82a9ac4f65 Fix phpcs 2019-03-15 16:07:08 +01:00
Laurent Destailleur
0126303fae Fix new line on description of expense report 2019-03-15 16:05:50 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
Laurent Destailleur
413ecd1d68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-15 15:08:09 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
1f02b74fee
Merge pull request #10843 from grandoc/new_branch_html5 
update with html5 compliant code
 2019-03-15 12:30:09 +01:00
Laurent Destailleur
32767a487b FIX Missing id in call of restrictedArea for expense report card.php 2019-03-15 10:18:58 +01:00
Philippe GRAND
dc8de23c1a update with html5 compliant code 2019-03-14 19:21:27 +01:00
Philippe GRAND
3f0bd79324 update with html5 compliant code 2019-03-14 19:17:59 +01:00
Philippe GRAND
a479d536c5 update with html5 compliant code 2019-03-14 19:17:00 +01:00
Philippe GRAND
6fb85c0930 update with html5 compliant code 2019-03-14 19:09:02 +01:00
Philippe GRAND
133997b195 update with html5 compliant code 2019-03-14 19:07:22 +01:00
Philippe GRAND
33aa7fa309 update with html5 compliant code 2019-03-14 19:06:30 +01:00
Philippe GRAND
309514c15c update with html5 compliant code 2019-03-14 19:03:58 +01:00
Philippe GRAND
9f420bdd08 update with html5 compliant code 2019-03-14 19:02:37 +01:00
BENKE Charlene
fef1f06d14
Update card.php 2019-03-13 10:15:32 +01:00
BENKE Charlene
79bb613285
Update card.php 2019-03-13 10:12:25 +01:00
BENKE Charlene
5e78907292
replace "brouillonner" by "setdraft" 2019-03-13 10:09:17 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
799271daa5 Try to add more log to debug expense report creation error 2019-03-09 01:45:11 +01:00
Laurent Destailleur
b766031abf Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
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
daaa4ca0c2
Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed 
PSR2.Classes.PropertyDeclaration.VarUsed
 2019-03-07 12:49:13 +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
c513116717 FIX missing vat_src_code when inserting an expense report line 2019-03-07 10:56:48 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +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
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +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
f153a4c152
Merge pull request #10380 from aspangaro/10.0_phpcs 
Phpcs Ignore Alert Generic.CodeAnalysis.UnusedFunctionParameter
 2019-01-21 23:42:12 +01:00
Alexandre SPANGARO
5efac262aa Phpcs Generic.CodeAnalysis.UnusedFunctionParameter 2019-01-20 20:44:18 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
f613121c2d update with html5 compliant code 2019-01-19 12:42:17 +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
29bd782c8c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-15 11:48:32 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
Laurent Destailleur
928ccc64eb
Merge pull request #10098 from aljawaid/aljawaid-expense_remainder_pay_amount 
NEW: Add Autofill Remainder Amount to Expense Report Payment Page
 2018-12-14 19:36:18 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134 
refactoring list.php with dol_sql_datefilter
 2018-12-14 19:06:29 +01:00
Laurent Destailleur
1971482c24
Merge pull request #10180 from fappels/payments_pdf_expensereport 
NEW add payments table to pdf of expense report
 2018-12-14 17:46:48 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
fappels
6d27a6458e Fix travis 2018-12-05 11:10:42 +01:00
fappels
d1d41f4dd4 New add payments table to pdf expense report 2018-12-04 23:16:41 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
BENKE Charlene
7378a2f1c6
Update list.php 2018-12-02 00:02:10 +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
95be3976c4
NEW: Add Autofill Remainder Amount to Expense Report Payment Page 2018-11-29 22:37:07 +00:00
Laurent Destailleur
d5c28a76d8
Merge pull request #10079 from aljawaid/aljawaid-fix_payment_type 
FIX: Display All Types of Payments on Expense Report Card
 2018-11-29 11:17:31 +01:00
Laurent Destailleur
b9e544d291 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/resource/list.php
 2018-11-26 23:08:06 +01:00
Laurent Destailleur
653b99cb33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:07 +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
fappels
322ce410d7 Add missing paid field in fetch sql 2018-11-23 09:42:43 +01: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
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
dfb20c705e NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE 2018-10-31 16:05:50 +01:00
Frédéric FRANCE
395e9ceae2
fix stats display expensereport 2018-10-30 20:36:12 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Frédéric FRANCE
fa48a442d6
use strict compare 2018-10-27 21:21:59 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
852b069785 Fix reponsive in stats pages 2018-10-26 15:46:17 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00