lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,762 Commits 43 Branches 150 Tags 886 MiB
8214e7bb42
Commit Graph

452 Commits

Author SHA1 Message Date
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Regis Houssin
544d051fe3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Regis Houssin
cd095e99c9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +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
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
7066ec7dab NEW Can clone expense report on another user 2017-05-29 13:22:52 +02:00
Laurent Destailleur
395d361d66 Look and feel v6 2017-05-29 11:38:23 +02:00
Alexandre SPANGARO
48477e00fd Review payment part on expense report card 2017-05-28 06:49:17 +02:00
Alexandre SPANGARO
570f9aaa9e Review old payment page for expense report 2017-05-27 08:18:53 +02:00
Laurent Destailleur
f5e29d6c86 Fix phpcs warning 2017-05-22 10:45:02 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
5e54567558 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
 2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2 Fix label "total for this page" on last page. 2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
31d99bbfe6 Complete event tracked automatically 2017-05-02 12:17:25 +02:00
Laurent Destailleur
cbc6684ea7 Fix error management 2017-04-14 18:59:01 +02:00
Laurent Destailleur
8c07f514c8 Add php unit tests on expense reports 2017-04-14 16:51:30 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
87368908f6 Merge pull request #6646 from laudeco/feature/expense_report_paid 
NEW mark expense report as paid if payement set the remaining sold to 0
 2017-04-06 22:01:28 +02:00
De Coninck Laurent
ae2e40e5e7 mark expense report as paid if payement set the remaining sold to 0 2017-04-05 19:06:21 +02:00
Laurent Destailleur
1dc2cae3a5 NEW Show company into combo list of projects 2017-04-05 11:51:55 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
93687997c9 Work on 6.0 look and feel 2017-03-31 18:40:53 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02:00
Laurent Destailleur
df17de9d48 Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf 
add 'fusion pdf' in mass action of expense report
 2017-03-24 22:50:54 +01:00
Laurent Destailleur
acdfd6ab9e css enhancement 2017-03-21 18:23:58 +01:00
Laurent Destailleur
9a13dc92ab bottom-border useless 2017-03-21 18:00:11 +01:00
Laurent Destailleur
e6637422d5 Fix with on smartphone 2017-03-21 17:58:41 +01:00
Laurent Destailleur
b0a75da2ac Fix css 2017-03-21 17:50:52 +01:00
De Coninck Laurent
a05ebb6c65 add 'fusion pdf' in mass action of expense report 
Add a mass action 'fusion pdf (build doc)' in expense report list
 2017-03-18 11:51:45 +01:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
f2c7b7da7e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-05 22:00:19 +01:00
Laurent Destailleur
198cf18a78 Fix phpcs 2017-03-05 21:59:51 +01:00
Laurent Destailleur
a95e41644c Merge pull request #6478 from laudeco/fix/load_board_stat 
[Expense report] - fix the load board query
 2017-03-05 21:38:16 +01:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
Laurent Destailleur
29618890f4 Fix permission on expense report 2017-03-02 12:11:25 +01:00
Laurent Destailleur
07d121a7a0 Fix compatibility with multicompany module 2017-03-02 12:07:54 +01:00
Laurent Destailleur
f306b21d80 Fix compatibility with multicompany module 2017-03-02 12:06:40 +01:00
Laurent Destailleur
da72bab33d Fix compatibility with multicompany module 2017-03-02 12:05:37 +01:00
Laurent Destailleur
8ccc57e70f Fix compatibility with multicompany 2017-03-02 11:46:31 +01:00
De Coninck Laurent
e54e1fd1e2 [Expense report] - fix the load board query 2017-03-01 14:37:59 +01:00
Laurent Destailleur
3b85a41991 Fix PHPCS 2017-02-27 02:14:37 +01:00
Laurent Destailleur
04044df36a Fix merge 2017-02-27 01:23:21 +01:00
Laurent Destailleur
4f24613de0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2017-02-27 01:19:03 +01:00
Laurent Destailleur
1f9b41b178 Merge pull request #6467 from laudeco/fix/expense_report_name 
prepend the author firstname and lastname for ER ref
 2017-02-24 15:51:47 +01:00
Laurent Destailleur
4e4ad4548a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-24 15:51:28 +01:00
Laurent Destailleur
5733826a68 Fix do not lose the user of expense report when we edit it. 2017-02-24 15:51:10 +01:00
Laurent Destailleur
77d5de6470 Merge pull request #6466 from laudeco/fix/edition_expense_report_without_tva 
fix edition of expense report without vat
 2017-02-24 15:29:13 +01:00
De Coninck Laurent
7e80505104 prepend the author firstname and lastname for ER ref 
Instead of using the validator of the ER use the author firstname and last name.
This is not always the case as soon ass someone can create ER for someone else
 2017-02-24 13:49:34 +01:00
De Coninck Laurent
8be9679f84 add space 2017-02-24 12:31:14 +01:00
De Coninck Laurent
4fc0468356 fix edition of expense report without vat 2017-02-24 12:07:32 +01:00
De Coninck Laurent
6961db0007 use access right to validate expense report created for someone else 2017-02-24 11:01:52 +01:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-02-23 02:55:50 +01:00
Laurent Destailleur
a79903a2fc Fix responsive design 2017-02-23 01:29:35 +01:00
Laurent Destailleur
c3d78bf1b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/update.php
 2017-02-16 22:09:37 +01:00
Laurent Destailleur
0d1bb5e7eb FIX If bank module on, field must be required to register payment of 
expense report.
 2017-02-15 23:22:47 +01:00
De Coninck Laurent
04d73668cc fix correct url for expense report note in expense report list 2017-02-08 19:28:01 +01:00
Laurent Destailleur
8ba544fba5 Merge pull request #6402 from laudeco/bugfix/er_fix_access_to_note 
[FIX] Expense report, fix access to notes from list
 2017-02-08 19:25:27 +01:00
De Coninck Laurent
439bda053d fix correct url for expense report note in expense report list 2017-02-08 19:18:16 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2017-02-08 10:59:05 +01:00
Laurent Destailleur
821978d54c FIX #6363 More complete fix 2017-02-06 20:08:47 +01:00
De Coninck Laurent
bbf34bfda8 [expense type deactivate] [#6363] Expense type deactivated but list 
When an expense type is disabled in dictionaries, it's always displayed and selectable in expense note module, when we create a new line in an expense note.
 2017-02-06 18:57:56 +01:00
phf
f2fdee0ed2 New add trigger for expensereport object 2017-02-02 11:42:38 +01:00
Laurent Destailleur
13f37b2cb9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-02 02:24:57 +01:00
Laurent Destailleur
f31eaef0d9 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-02 01:21:58 +01:00
Laurent Destailleur
68a6a08a01 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-02-02 01:20:45 +01:00
Laurent Destailleur
1785ef9957 Code comment 2017-02-02 00:59:07 +01:00
Maxime Kohlhaas
90e8f062e9 Fix : link to user in bank was wrong regarding expensereport payment 2017-01-31 10:23:03 +01:00
Laurent Destailleur
70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-01-27 01:26:11 +01:00
Laurent Destailleur
4c28e1598b Merge branch '5.0' into 5.0 2017-01-27 00:25:12 +01:00
Laurent Destailleur
053afe21dd Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2017-01-26 23:40:16 +01:00
Laurent Destailleur
c1b59b1950 Fix several security bugs on expense report 2017-01-26 18:08:00 +01:00
Ferran Marcet
debfb97903 Fix: Write All Right don't work 2017-01-25 19:12:02 +01:00
Laurent Destailleur
5fd8b1efcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 21:23:35 +01:00
Laurent Destailleur
f875597c0b Fix statistics of leave requests (date valid not defined if status is 
draft)
 2017-01-22 16:03:08 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
4349eac7ea Merge pull request #6225 from aspangaro/5.0-18 
Expense report - Better presentation - return lines order by date
 2017-01-12 11:37:31 +01:00
Laurent Destailleur
0548e9cc4e Merge pull request #6226 from aspangaro/5.0-19 
NEW Expense report now send email on different validatin steps (Remove DEPLACEMENT_TO_CLEAN)
 2017-01-12 11:15:14 +01:00
Laurent Destailleur
a4edaf4f43 Fix sql to get next ref on expense report 2017-01-03 10:18:47 +01:00
Laurent Destailleur
85f9da7718 Fix link 2017-01-02 13:52:32 +01:00
Laurent Destailleur
fd09a3d35e Fix link to notes and download pdf not visible on list of expense report 2017-01-02 13:51:05 +01:00
aspangaro
4705a87548 Finish work 2016-12-27 14:48:14 +01:00
aspangaro
8a24f2fc91 Work in progress 2016-12-27 08:14:05 +01:00
aspangaro
c21300f0fa Expense report - Remove DEPLACEMENT_TO_CLEAN 2016-12-27 06:45:36 +01:00
aspangaro
1338237d7c Expense report - Better presentation - return list order by date 2016-12-27 05:48:18 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
22b4a150a4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-22 17:31:22 +01:00
Laurent Destailleur
b4ed0a1e12 Fix nb of lat approvals wrong 2016-12-22 17:30:39 +01:00
Laurent Destailleur
bdead24e2e Fix bad var get 2016-12-22 17:27:58 +01:00
Laurent Destailleur
b2776a62d8 Fix bad link 2016-12-22 16:23:38 +01:00
Laurent Destailleur
4875509b56 Fix sort criterias 2016-12-22 15:57:19 +01:00
Laurent Destailleur
d66bc10d05 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
 2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84 Fix warning for approval delay. 2016-12-22 15:49:06 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
9f0528f5f1 Complete work on dol_banner 2016-12-14 00:06:50 +01:00
aspangaro
eef245d23b Expense report - Hidden button to generate files in create mode 2016-12-08 22:17:03 +01:00
aspangaro
0d5c035034 Expense report - Remove filed note_private and note_public in card. Already in tab Notes 2016-12-08 22:12:16 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2016-12-06 14:08:43 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
4abd417a6a Corrupted data must be fixed by repair not by code hack. 2016-12-03 19:50:52 +01:00
Laurent Destailleur
9c47f3d3fd Restore protection to avoid errors 2016-12-03 19:41:03 +01:00
Laurent Destailleur
6e5a8b6787 FIX Some statistics not compatible with multicompany module. 2016-12-03 19:14:16 +01:00
Laurent Destailleur
fe54673a87 FIX List of people able to validate an expense report was not complete. 2016-12-03 18:13:23 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
 2016-12-03 16:01:18 +01:00
Laurent Destailleur
a75577516d Fix pb with multicompany on expense report 2016-12-03 15:13:04 +01:00
Laurent Destailleur
411e82b7a3 Fix button set to paid not always visible when it should. 2016-12-02 14:52:38 +01:00
Laurent Destailleur
317df1cf91 Complete work on use of the new ol_banner_tab. 2016-11-30 20:24:36 +01:00
Laurent Destailleur
401ce91883 Merge pull request #6045 from aspangaro/5.0-p36 
Fix: Expense report list return empty date field
 2016-11-29 23:04:16 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
aspangaro
044c4bda3b Fix: Expense report return empty date field 2016-11-28 06:53:34 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
Laurent Destailleur
d197a0e0aa NEW Can create expense report for someone else (advanced permission) 
NEW Can clone an expense report
 2016-11-13 22:01:22 +01:00
Laurent Destailleur
04063a62a8 Better responsive 2016-11-12 15:18:38 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
Laurent Destailleur
6938b05219 Mutualize code to show files generated for mass actions 2016-10-28 12:00:30 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Laurent Destailleur
4955e8d3de Fix doxygen 2016-09-10 05:34:00 +02:00
Laurent Destailleur
d7fce0cd24 NEW REST api: Add apis for expense reports 2016-09-09 20:17:34 +02:00
Laurent Destailleur
748656856e Fix doxygen 2016-09-09 18:56:13 +02:00