Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
60,834 Commits 36 Branches 189 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

11886 Commits

Author SHA1 Message Date
Alexandre SPANGARO
d7614af96e Fix : Link to loan admin isn't required, already support by page default account 2017-02-14 06:45:12 +01:00
Laurent Destailleur
868f2e5473 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/update.php
	htdocs/core/lib/functions.lib.php
 2017-02-13 01:36:02 +01:00
Laurent Destailleur
0e6ba5df4e Merge pull request #6410 from aspangaro/5.0-25 
Fix : Bank account label not shown in dol_banner_tab
 2017-02-12 20:42:38 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
Laurent Destailleur
7e3785d446 FIX the dolCopyDir fails if target dir does not exists. 2017-02-11 15:42:57 +01:00
Laurent Destailleur
3fa19f84e3 FIX the dolCopyDir fails if target dir does not exists. 2017-02-11 15:40:25 +01:00
Laurent Destailleur
f5569ee890 Add tasktime_task_duration_sec tag in odt substitution 2017-02-11 13:50:30 +01:00
Laurent Destailleur
d72e5a3646 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2017-02-10 17:33:32 +01:00
arnaud
4230b075c2 INIT pdf supplier payment 2017-02-10 17:28:00 +01:00
Laurent Destailleur
d463511cff Fix: no way to know type of invoice. 2017-02-10 17:24:47 +01:00
Alexandre SPANGARO
5c9c761911 Fix : Bank account label not shown in dol_banner_tab 2017-02-09 05:58:39 +01:00
Laurent Destailleur
767e842c68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-09 01:08:17 +01:00
Laurent Destailleur
5d94c8ddac Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement 
[FIX] - Expense report on multiple page
 2017-02-08 19:34:16 +01:00
Laurent Destailleur
ad361d6d45 Merge pull request #6394 from aspangaro/6.0-fiscalyear 
[FP17] Accountancy - Prepare fiscal year
 2017-02-08 19:25:02 +01:00
Laurent Destailleur
4d16540207 Merge pull request #6393 from aspangaro/6.0-export 
NEW : [FP17] Accountancy - Add export of charts of accounts
 2017-02-08 19:22:26 +01:00
De Coninck Laurent
a042c30b28 fix nex line 2017-02-08 19:00:48 +01:00
Ion
22b85b3aba Show delay in syslog 2017-02-08 17:30:51 +01:00
Laurent Destailleur
596c092ec8 Merge pull request #6219 from atm-florian/dev_changelistchild 
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
 2017-02-08 16:49:18 +01:00
Laurent Destailleur
6fef6ac2fb Optimize code and performance of module variant 2017-02-08 14:07:54 +01:00
Laurent Destailleur
d5b10a18b7 Debug module variant 2017-02-08 12:52:31 +01:00
Laurent Destailleur
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67 Merge pull request #5533 from marcosgdf/prod-attr 
Feature Request: NEW Added product attributes feature
 2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received 
NEW Develop new reduc on excess received
 2017-02-08 11:16:10 +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
4c3255857c Fix bad syntax into criteria to filter on date in export. 
Fix missing type in export of invoices.
 2017-02-08 10:45:20 +01:00
De Coninck Laurent
49e6192e62 fix the type width column and the nextY 2017-02-08 09:23:15 +01:00
Alexandre SPANGARO
4126dcff03 [FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed. 2017-02-08 06:51:42 +01:00
Alexandre SPANGARO
e4fc52497e New : [FP17] Accountancy - Add export of charts of accounts 2017-02-08 06:18:56 +01:00
Laurent Destailleur
8e733ca2fe Remove menu entry that is not reserved to admin users frmo admin area. 2017-02-07 19:58:49 +01:00
Laurent Destailleur
2d77cb2da5 FIX #6379 2017-02-07 00:54:54 +01:00
Laurent Destailleur
fcbc12ce31 Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project 
New link movement stock to project
 2017-02-06 20:45:04 +01:00
Laurent Destailleur
b3e6b95714 Merge pull request #6377 from marcosgdf/fr-2763 
NEW #2763 Go to document block after clicking in Generate document button
 2017-02-06 20:38:36 +01:00
Laurent Destailleur
8f52a34e71 Report of supplier payment is name "supplier_payments" 2017-02-06 20:37:42 +01:00
Laurent Destailleur
a4bbcd866b Merge pull request #6372 from atm-arnaud/NEW_supplier_paiements_report 
NEW Add supplier paiements report
 2017-02-06 20:29:42 +01:00
Laurent Destailleur
d230883638 Merge pull request #6367 from gnovaro/patch-2 
Code style
 2017-02-06 20:25:16 +01:00
Laurent Destailleur
9220a638b5 NEW Filechecker can include custom dir and report added files. 2017-02-06 15:29:07 +01:00
Laurent Destailleur
a673afe601 NEW Description of feature of a module into a dedicated popup 2017-02-04 14:16:17 +01:00
Laurent Destailleur
f75bd1ac44 Doxygen for javascript functions file. 2017-02-04 11:02:10 +01:00
Marcos García de La Fuente
2dfced366e NEW #2763 Go to document block after clicking in Generate document button 
Close #2763
 2017-02-03 20:11:06 +01:00
arnaud
7f6ab748c5 NEW add rapport file for supplier paiement 2017-02-03 16:42:06 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
Laurent Destailleur
10353d1e1a Merge pull request #6370 from defrance/patch-72 
FIX : $resaction not used in all case in hookmanager
 2017-02-03 16:09:19 +01:00
Laurent Destailleur
bda915c63a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:34:59 +01:00
BENKE Charlie
3f236b1ebf FIX : $resaction not used in all case 
Please integrate on next 5.0
 2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f Merge pull request #6211 from GPCsolutions/optimizetranslate 
[Qual] Optimize language file loading
 2017-02-03 11:55:29 +01:00
Laurent Destailleur
3dea950c24 Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project 
New htmlid can be use instead of htmlname for select projects
 2017-02-03 11:44:54 +01:00
Laurent Destailleur
76280f8ae2 Fix #6365 2017-02-03 11:42:49 +01:00
florian HENRY
dccddf5c7e NEW : change render extrafields checkbox list for multiselectarray 2017-02-03 09:25:26 +01:00
Laurent Destailleur
bdca134e99 NEW Change to allow a specific numbering rule for invoice with POS 
module.
 2017-02-02 23:49:17 +01:00