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

678 Commits

Author SHA1 Message Date
BENKE Charlie
5b5380659e ERROR Categories Bank vs categories transactions 
PB since 4.0, present in 5.0 and develop version
There is a confusion between the categorization function of bank accounts and the categorization function of the records. The categorization of the entries has been removed or it is not replaced by the categorization of the bank accounts.
I propose for the moment to restore the old category of writings but to envisage the creation of a new type of category "bank records" (or if it is not necessary with the new account) to leave so
 2017-04-03 15:58:48 +02:00
Laurent Destailleur
d975e7f442 Work on 6.0 look and feel 2017-04-01 12:46:47 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal 
New : [FP17] Accounting multi-journals
 2017-03-31 17:45:10 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Alexandre SPANGARO
aa924bf010 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 
# Conflicts:
#	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-03-27 22:35:06 +02:00
Laurent Destailleur
664380d304 Css enhancement 2017-03-23 21:24:57 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
7dd0f14563 Fix link to reconciliated function 2017-03-16 21:03:35 +01:00
Laurent Destailleur
68d3a93027 Fix link to reconcile 2017-03-16 20:36:51 +01:00
Laurent Destailleur
6c392fad9f Fix CSS 2017-03-14 14:06:55 +01:00
Laurent Destailleur
ec7d48931e Merge duplicate menus/page on projects 2017-03-14 13:49:04 +01:00
Laurent Destailleur
0a0797e797 Rename menu entry 2017-03-03 13:36:38 +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
d5bb208957 Clean admin menu entries 2017-02-22 02:19:50 +01:00
Laurent Destailleur
bb72121179 Fix menu loading 2017-02-22 01:47:22 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Alexandre SPANGARO
1401e9267b [FP17] Modify menu for multijournal 2017-02-21 07:09:58 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
702ad5bcde Fix menus 2017-02-20 11:29:30 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not 
admin user.
 2017-02-20 11:21:38 +01:00
Laurent Destailleur
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
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
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
8e733ca2fe Remove menu entry that is not reserved to admin users frmo admin area. 2017-02-07 19:58:49 +01:00
arnaud
6d3e43ddaf NEW Report page and menu for suppliers paiements 2017-02-03 16:34:14 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
9d6f84c3a0 FIX Try a better fif for #6074 2017-01-18 16:27:23 +01:00
Laurent Destailleur
f00f3101d9 Merge pull request #6013 from aljawaid/develop 
NEW: Make Top Menu Entries Independent Translation Strings
 2017-01-07 20:45:44 +01:00
Laurent Destailleur
b777ec79f2 Fix contextpage implementation into skeleton 2016-12-23 10:38:27 +01:00
Laurent Destailleur
ae185105d6 Merge pull request #6064 from defrance/patch-48 
Change left menu name of categorie
 2016-12-01 21:47:21 +01:00
BENKE Charlie
c23919c51a change left menu name of categorie 
It is impossible to add sub-menus to other categories left menus if not...
 2016-11-30 09:41:33 +01:00
Laurent Destailleur
d86c3931e2 Fix translation 2016-11-30 09:09:09 +01:00
IJ
636fbb476c Add Unique Top Menu Translation 
Add unique top menu translation for Tools so it can be better translated separately from other words/links using the same text.
 2016-11-19 10:49:12 +00:00
IJ
86d195fa81 Add Unique Top Menu Translation 
Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
 2016-11-19 10:37:15 +00:00
IJ
056b76a831 Better Separator for Products/Services in Top Menu 
Easier to read when both modules are enabled
 2016-11-19 10:34:22 +00:00
Laurent Destailleur
4fd2335bbf Fix var name 2016-11-07 10:14:04 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
Laurent Destailleur
6661773a06 Clean menu 2016-11-03 16:40:55 +01:00
Juanjo Menent
a59cf0e13b Merge pull request #5935 from aspangaro/5.0-p32 
Accountancy - Add binding and journal for expense reports
 2016-10-28 11:25:21 +02:00
Laurent Destailleur
75695fafa6 Merge pull request #5917 from aspangaro/5.0-p31 
Accountancy - Add menu expense report accounts in configuration
 2016-10-26 11:03:00 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
Laurent Destailleur
5d655d47fe Enhance css 2016-10-25 12:36:14 +02:00
aspangaro
dc727ebb3c Accountancy - Add binding and journal for expense reports 2016-10-24 06:41:32 +02:00
aspangaro
0d62148a0f Accountancy - Add menu expense report accounts in configuration 2016-10-24 06:27:20 +02:00
Laurent Destailleur
ab3cdfa16d Clean code 2016-10-24 00:33:39 +02:00
Laurent Destailleur
939afa9569 NEW Can make reconcile directly from bank entry list 2016-10-23 23:24:55 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
Laurent Destailleur
50a5fe6fd9 Work on accounting module 2016-10-21 18:24:46 +02:00
Laurent Destailleur
f0365e49e2 Fix book keeper can edit accounting account of taxes 2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97 Debug module accounting 2016-10-21 17:41:05 +02:00
Laurent Destailleur
47d4b184cd FIX Size of top menu image when menu is not allowed 2016-10-21 17:24:22 +02:00
Laurent Destailleur
304a44ffc2 Debug accounting module 2016-10-21 14:48:55 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Laurent Destailleur
9cad437d5c Fix list in chart of account 2016-10-15 16:20:08 +02:00
Laurent Destailleur
170a2e9889 Fix menu 2016-10-15 15:54:58 +02:00
Laurent Destailleur
04c0e87d79 Work on accounting module 2016-10-15 15:51:28 +02:00
Laurent Destailleur
c689248211 The setup that must be done by the bookkeeper is removed from admin 
setup and move into setup of accountancy
 2016-10-15 14:38:43 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
Laurent Destailleur
93c848fcc5 Add page index for accountancy module 2016-10-06 17:43:10 +02:00
Laurent Destailleur
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9 Better terminology 2016-10-05 18:31:55 +02:00
Laurent Destailleur
2f7bdbaab3 Fix menu auto deployment for local tax 2016-10-04 10:53:38 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
504ee9c73e NEW Add system tool "Files integrity checker" to detect modified files 
for packaged versions.
 2016-09-30 12:01:06 +02:00
Laurent Destailleur
8d2ae73663 FIX Menu users not visible on dolidroid. 2016-09-30 10:56:35 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
Laurent Destailleur
78c0945fe7 Fix menu switch on accountancy and picto of product not using correct 
type.
 2016-09-28 23:59:47 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
Laurent Destailleur
2acce85fab NEW Pagination available on list of users 2016-09-12 21:32:27 +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
79f19f5c66 Fix missing a filter billed=0 into link of billable orders 2016-09-10 17:48:57 +02:00
Laurent Destailleur
6d6eceb0ca Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-08 11:39:38 +02:00
Laurent Destailleur
f440e78fa6 FIX quick search boxes when nojs or when using smartphone 2016-09-03 12:56:49 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +02:00
florian HENRY
56f0ffee0b add category entry menu into auguria menu sql 2016-08-29 10:47:13 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
57cbda416b Minor fix on stock 2016-08-08 20:41:49 +02:00
Laurent Destailleur
2133b1c3b5 NEW Table with list of lots/serial can be viewed (module product batch). 2016-08-08 20:31:03 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
5f0951dcda Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:20:40 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank 
tranfert for payements
 2016-07-30 17:28:18 +02:00
Laurent Destailleur
f54946bacb Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-07-28 10:10:58 +02:00
Laurent Destailleur
dfa33bf173 Fix men unot visible 2016-07-28 10:09:13 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
5fa8a6c311 Fix to avoid pb of performances 2016-07-27 17:40:19 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
8504e09e72 Fix permission to enter time spent 2016-07-09 12:35:12 +02:00
Laurent Destailleur
0be23553a4 Fix menu closing 2016-06-29 19:43:42 +02:00
Laurent Destailleur
d1850be261 Fix conflict in leftmenu value for projet menu 2016-06-29 17:00:05 +02:00
Laurent Destailleur
5f5328c3d8 FIX Link in menu when using left menu editor was wrong. 
FIX Updating an entry with menu editor did not save fk_leftmenu.
 2016-06-29 14:09:18 +02:00
Laurent Destailleur
5222b78e95 FIX property of bank account were lost if an error occured during 
saving.
 2016-06-25 14:20:23 +02:00
Laurent Destailleur
b953e8f364 Minor fix 2016-06-21 12:15:41 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
34c741bf0d FIX CSS and responsive behaviour (feature with a menu hider is on on 
smarpthone)
 2016-06-17 16:28:16 +02:00
Laurent Destailleur
48f30b5ef1 Cleaner menu 2016-06-17 12:39:00 +02:00
Laurent Destailleur
1396f11b77 css fix 2016-06-12 20:31:38 +02:00
Laurent Destailleur
65cbf1623b Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER 2016-06-12 20:24:05 +02:00
Laurent Destailleur
74e59a1bc4 Debug prototype feature "testmenuhider" 2016-06-10 18:41:10 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
028ff5e84c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
 2016-06-01 17:59:50 +02:00
Laurent Destailleur
2290f6a123 FIX Menu statistics was not visible if module proposal was not enabled 2016-05-30 13:11:44 +02:00
Laurent Destailleur
7278d1f2c6 NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check 
deposit feature.
 2016-05-27 10:38:15 +02:00
Laurent Destailleur
426454a67b Prepare the hide left menu icon 2016-05-22 19:32:08 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
86076c2a01 Fix doxygen 2016-05-17 19:49:37 +02:00
Laurent Destailleur
1973f67d41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-05-17 01:11:14 +02:00
Laurent Destailleur
3a28935da3 Merge remote-tracking branch 'origin/3.9' into develop 2016-05-17 01:10:22 +02:00
Laurent Destailleur
cba0ef5693 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-05-14 00:44:38 +02:00
Laurent Destailleur
986119d2b5 Start debug 2016-05-12 21:32:24 +02:00
Frédéric FRANCE
3607f1a296 Correction for Auguria Menu Accounting Expert 
Entry cause blank windows
 2016-05-09 22:15:00 +02:00
Laurent Destailleur
1032583b02 Better support for accessiblity 2016-05-09 14:59:59 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
Maxime Kohlhaas
72ef11f593 Fix bank submenu error 2016-04-22 11:59:55 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page 
& review
 2016-04-17 15:44:04 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Marcos García de La Fuente
b9de3d5852 FIX #4442 Missing translation in Banks menu 
Close #4442
 2016-04-09 23:03:00 +02:00
Laurent Destailleur
01e538fa78 Merge pull request #4942 from aspangaro/4.0-p16 
NEW: Move HRM area page in HRM directory
 2016-04-08 20:51:17 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
aspangaro
c6aabd3f34 NEW: Move HRM area page in HRM directory 2016-04-04 05:29:12 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
aspangaro
3c09e67453 Merge remote-tracking branch 'Upstream/develop' into 4.0-p2 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-03-21 20:38:17 +01:00
aspangaro
0b1a689a24 FIX: Some typo on auguria menu 2016-03-20 08:08:28 +01:00
aspangaro
57ebb7c997 NEW: Move Expense report menu from module to menu files 2016-03-20 07:34:48 +01:00
Laurent Destailleur
d4c6c4c140 NEW Holiday is a RH module. All RH module provides by default visilibity 
on users of its hierarchy.
 2016-03-14 21:22:49 +01:00
Laurent Destailleur
5bd5323c93 Finished to move the mergepdftool dedicated page into the generic "mass 
actions" feature.
 2016-03-10 12:11:11 +01:00
Marcos García de La Fuente
ff83dd9afe Replaced account type comparisons with TYPE constants 2016-03-02 11:08:57 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +01:00
aspangaro
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +01:00
Florian HENRY
ef7e245432 g 2016-02-09 19:23:17 +01:00
Florian HENRY
4401995540 Accountancy feature 2016-02-09 19:22:52 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Laurent Destailleur
cfa3b16637 Menu entries for accountancy are shown when menu entry is selected and 
not all the time
 2016-02-07 22:47:46 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00