Laurent Destailleur
|
7eed8ce370
|
Merge pull request #17327 from dolibit-ut/patch-283
Update document.php
|
2021-04-19 20:27:49 +02:00 |
|
UT from dolibit
|
9b9ddc2c3c
|
Update list.php
$xxxx_start / $xxxx_end : " " => ' '
|
2021-04-19 17:37:08 +02:00 |
|
stickler-ci
|
d9db752339
|
Fixing style errors.
|
2021-04-19 15:32:00 +00:00 |
|
UT from dolibit
|
e7ee46049f
|
Update index.php
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
|
2021-04-19 17:29:52 +02:00 |
|
UT from dolibit
|
8fc3f9c919
|
Update document.php
$helpurl => $help_url
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
|
2021-04-19 17:28:13 +02:00 |
|
Laurent Destailleur
|
dcf460e248
|
Use css on img_picto
|
2021-04-14 12:28:01 +02:00 |
|
Anthony Berton
|
707bf5adca
|
picto_mass_actions
|
2021-04-14 10:20:34 +02:00 |
|
Laurent Destailleur
|
358bb87ae2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
|
2021-04-13 20:19:05 +02:00 |
|
Alexandre SPANGARO
|
4b9bf40a8f
|
move include_once to include when it's a tpl
|
2021-04-12 21:25:58 +02:00 |
|
Laurent Destailleur
|
8a62d97b89
|
Remove one thousand of useless files
|
2021-04-12 15:57:16 +02:00 |
|
Laurent Destailleur
|
667481acd5
|
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
|
2021-04-08 19:05:28 +02:00 |
|
Laurent Destailleur
|
be6bb3a756
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 19:12:07 +02:00 |
|
Laurent Destailleur
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Laurent Destailleur
|
6e422d26f3
|
FIX #yogosha5746 - next step (wip)
|
2021-03-30 16:20:18 +02:00 |
|
Laurent Destailleur
|
d61f61ab45
|
Clean $_GET
|
2021-03-30 03:55:17 +02:00 |
|
Laurent Destailleur
|
fb84608586
|
Clean sql
|
2021-03-30 03:37:54 +02:00 |
|
Laurent Destailleur
|
dc0922c8f0
|
Clean file not used
|
2021-03-29 21:33:01 +02:00 |
|
Laurent Destailleur
|
1d87f060dc
|
Fix #yogosha5756
|
2021-03-29 21:30:26 +02:00 |
|
Laurent Destailleur
|
3a4bb69c05
|
FIX #yogosha5749
|
2021-03-29 15:32:09 +02:00 |
|
Laurent Destailleur
|
4cacca413e
|
FIX #yogosha5757
|
2021-03-29 14:43:40 +02:00 |
|
Laurent Destailleur
|
a5034d44f7
|
$_POST war
|
2021-03-24 19:53:31 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
UT from dolibit
|
edd7de7abf
|
Update card.php
changed: $helpurl to $help-url
add: FR:Module_Notes_de_frais
$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";
llxHeader("", $title, $help_url);
|
2021-03-16 13:42:30 +01:00 |
|
Laurent Destailleur
|
bcf7fa1fc8
|
Merge pull request #16711 from frederic34/patch-8
fix php8 warnings
|
2021-03-16 10:33:21 +01:00 |
|
Alexandre SPANGARO
|
03481a0197
|
Uniformize translation
|
2021-03-16 04:22:43 +01:00 |
|
Frédéric FRANCE
|
6abe96289f
|
fix php8 warnings
|
2021-03-15 20:50:14 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
Frédéric FRANCE
|
8a69fa0d35
|
code syntax expensereport directory
|
2021-02-25 22:45:02 +01:00 |
|
Laurent Destailleur
|
026259ebd7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
|
2021-02-15 13:12:27 +01:00 |
|
Laurent Destailleur
|
29100a4766
|
FIX #16221
|
2021-02-10 02:28:22 +01:00 |
|
Laurent Destailleur
|
1b129831a9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-09 14:09:46 +01:00 |
|
Laurent Destailleur
|
48a4ed656b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2021-02-09 14:08:49 +01:00 |
|
Frédéric FRANCE
|
f394e55ade
|
deprecate non camelCaps functions
|
2021-02-09 10:26:17 +01:00 |
|
Frédéric FRANCE
|
0da942210f
|
deprecate non camelCaps functions
|
2021-02-09 09:55:48 +01:00 |
|
Florian HENRY
|
ff6b5c768d
|
fix indent
|
2021-02-08 20:46:21 +01:00 |
|
Florian HENRY
|
dbbebba497
|
this->errors is set on triggers action must be set by callers
|
2021-02-08 20:44:40 +01:00 |
|
Laurent Destailleur
|
eee49b9132
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/delais.php
|
2021-02-04 13:50:07 +01:00 |
|
Laurent Destailleur
|
284042af7a
|
FIX User creation of expense report not visible
|
2021-02-04 12:05:28 +01:00 |
|
Laurent Destailleur
|
eca010937f
|
FIX Trigger on expense report was not fired
FIX Bad dates on info tabs
|
2021-02-04 11:56:53 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +01:00 |
|
Laurent Destailleur
|
4d029194d3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
|
2021-02-02 13:22:23 +01:00 |
|
Laurent Destailleur
|
95e255747f
|
Fix accent on graph of expense report
|
2021-02-02 10:53:59 +01:00 |
|
Laurent Destailleur
|
a6eb14f68b
|
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
|
2020-12-27 15:06:35 +01:00 |
|
Laurent Destailleur
|
d65dc85a10
|
FIX for php 8
|
2020-12-23 19:16:25 +01:00 |
|
Laurent Destailleur
|
8e839a34e2
|
FIX for php 8
|
2020-12-23 19:14:47 +01:00 |
|
Laurent Destailleur
|
cce0b2f31b
|
Fix code
|
2020-12-14 10:44:51 +01:00 |
|
Laurent Destailleur
|
3d33d3aa3a
|
Fix warning
|
2020-12-13 14:36:00 +01:00 |
|
Laurent Destailleur
|
3521a736fc
|
Fix warnings
|
2020-12-12 19:49:13 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00:00 |
|
Christian Foellmann
|
f801dd7d66
|
PR toggle FCKeditor on public/private notes
|
2020-11-30 16:39:14 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
d3a2aa664f
|
FIX #15572
|
2020-11-29 20:27:40 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Laurent Destailleur
|
69b06a25e8
|
Fix code of deletion of objects
|
2020-11-26 09:16:16 +01:00 |
|
Laurent Destailleur
|
c1a1d4330a
|
Update expensereport.class.php
|
2020-11-25 19:55:11 +01:00 |
|
Frédéric FRANCE
|
9e56253704
|
Update expensereport.class.php
|
2020-11-25 18:37:03 +01:00 |
|
Laurent Destailleur
|
944e2a8032
|
Fix delete of expense report
|
2020-11-25 15:29:18 +01:00 |
|
stickler-ci
|
9da8cf63a2
|
Fixing style errors.
|
2020-11-25 12:07:57 +00:00 |
|
BENKE Charlene
|
62c361dc1a
|
fix better delete management (include extrafield too)
|
2020-11-25 13:04:26 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Scrutinizer Auto-Fixer
|
f6e3f58fcb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-11-09 14:18:56 +00:00 |
|
Laurent Destailleur
|
a9fbe9dd6c
|
Fix remove warning
|
2020-11-08 00:18:41 +01:00 |
|
Laurent Destailleur
|
40e18741b3
|
Fix look and feel v13
|
2020-11-04 18:05:48 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Frédéric FRANCE
|
c6433ef58b
|
fix undefined variable
|
2020-10-31 09:32:00 +01:00 |
|
Frédéric FRANCE
|
8190711342
|
doxygen
|
2020-10-30 18:01:01 +01:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
efce53abd1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/expensereport/class/expensereport.class.php
|
2020-10-26 18:17:23 +01:00 |
|
Laurent Destailleur
|
2c2142ddba
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-10-26 18:13:47 +01:00 |
|
Laurent Destailleur
|
adeddc70ca
|
FIX Deletion of expensereport + other generated object not complete.
|
2020-10-26 18:10:58 +01:00 |
|
Laurent Destailleur
|
6fa174d13f
|
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
|
2020-10-25 14:56:08 +01:00 |
|
Laurent De Coninck
|
1d62834b2c
|
use the second version for default bank account
|
2020-10-24 17:15:48 +02:00 |
|
Frédéric FRANCE
|
57064a7976
|
fix phpcs
|
2020-10-23 08:07:00 +02:00 |
|
Laurent Destailleur
|
c9a73cc380
|
Fix phpcs
|
2020-10-23 03:55:18 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
0616b9bc9b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-10-22 17:55:38 +02:00 |
|
Florian HENRY
|
10a3786bab
|
fix MAIN_AUTOFILL_DATE for expense payment date
|
2020-10-22 16:38:59 +02:00 |
|
Florian HENRY
|
c9e62845e8
|
fix is no PDF default model for expense report, no PDF created
|
2020-10-21 13:41:17 +02:00 |
|
Laurent De Coninck
|
d2e2cad028
|
select by default, remove the show empty everywhere the field is required
|
2020-10-17 21:15:52 +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
|
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
|
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 |
|
Laurent Destailleur
|
0b619f63f3
|
Fix error management on HR modules
|
2020-10-10 16:35:30 +02:00 |
|
Laurent Destailleur
|
437eead694
|
Fix bad permission
|
2020-10-10 15:45:04 +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
|
0893f0250a
|
Minor bug fixes
|
2020-10-02 12:54:56 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
f442dac2c9
|
Add token on most GET url for admin action
|
2020-09-30 15:13:28 +02:00 |
|
Tobias Sekan
|
a72519f353
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-23 09:09:42 +02:00 |
|
Laurent Destailleur
|
718497915c
|
Enhance the IK module
|
2020-09-21 16:31:51 +02:00 |
|
Laurent Destailleur
|
b3dd51b790
|
Fix warnings
|
2020-09-20 16:46:29 +02:00 |
|