Commit Graph

44184 Commits

Author SHA1 Message Date
Marcos García de La Fuente
7a28f8e4aa [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger 2014-09-14 13:59:06 +02:00
Marcos García de La Fuente
afd631e6e3 [ bug #1577 ] When creating new Private individual third, selected third type is ignored 2014-09-14 13:22:05 +02:00
Marcos García de La Fuente
74e16db632 [ bug #1589 ] Menu type in "Edit menu" page is not translated 2014-09-14 13:14:03 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
9a1a1eec21 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-14 12:21:46 +02:00
Laurent Destailleur
4e21891f14 Add lost PR 2014-09-14 12:06:38 +02:00
Laurent Destailleur
bd35395d13 Fix: missing permissions 2014-09-14 12:02:40 +02:00
Laurent Destailleur
20bec865fd Fix: checkstyle 2014-09-14 00:27:36 +02:00
Laurent Destailleur
ba70c1a08a Fix: typo on debian files 2014-09-13 20:47:34 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
09878a3a32 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-09-13 19:05:03 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
23eee1b83a New: Add hourly and daily amount on user card. Add weekly working hours
and salary on user card.
2014-09-13 17:41:26 +02:00
Laurent Destailleur
2cfe088ee4 Better organization of accountancy menus
Fix: sql error with pgsql
2014-09-13 16:54:17 +02:00
Cubexed
68994823dd Closed projects are greyed out in project selector 2014-09-12 18:00:55 +02:00
Cubexed
8a3bc25029 -Renamed POST "project" to "projectstart" to avoid strange behavior at project start date selector, probably the generic name "project" was interfering with something 2014-09-12 17:21:48 +02:00
Cubexed
71a1857b49 Ignore dateo/datee if is a null column 2014-09-12 16:46:19 +02:00
Cubexed
c23fab267c This commit adds a way to filter projects by checking if
selected year is in creation/ending range.

The year input is shown after the list, outside the table.

It's hidden by default and must be
enabled with PROJECT_LIMIT_YEAR_RANGE
2014-09-12 05:30:17 +02:00
Juanjo Menent
08a4713101 Trad: Syncro from transifex 2014-09-11 19:42:46 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +02:00
Cedric
86d8870939 Add create button on predefined invoice details
Check invoice creation right
2014-09-11 17:33:47 +02:00
Laurent Destailleur
0d37d51cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-11 17:33:04 +02:00
Laurent Destailleur
98d7ce94b8 Merge pull request #1873 from GPCsolutions/projectfixes
Projectfixes
2014-09-11 17:27:49 +02:00
Laurent Destailleur
215d6ec0bb Merge pull request #1872 from frederic34/patch-1
Update liste.php
2014-09-11 17:27:09 +02:00
Laurent Destailleur
dddafacad9 Merge pull request #1871 from KreizIT/3.6
Little fix
2014-09-11 17:15:29 +02:00
Laurent Destailleur
8af28c74c6 Merge pull request #1870 from aspangaro/develop-accounting
Patch Accounting Expert Module
2014-09-11 17:14:19 +02:00
Laurent Destailleur
7851587a11 Merge pull request #1869 from FHenry/3.6
Extrafield feature select from table should try to translate multiple column when not needed
2014-09-11 17:13:28 +02:00
Laurent Destailleur
aa2fc8605c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/societe/consumption.php
2014-09-11 17:13:24 +02:00
Laurent Destailleur
b728ccb52f Merge pull request #1865 from FHenry/3.5
Add missing image into amarok theme
2014-09-11 17:13:06 +02:00
Laurent Destailleur
1785943580 New: List of interventions of thirdparties visibles into the referer
page of thirdparties.
2014-09-11 17:11:16 +02:00
aspangaro
495a261bfd Add special thanks to developpers & contributors of module accounting. 2014-09-10 20:47:27 +02:00
aspangaro
4c52a6ee6f Add admin page into salaries to manage accountancy 2014-09-10 04:53:18 +02:00
aspangaro
25b66e0491 Add linkback into accountancy admin 2014-09-09 22:34:49 +02:00
aspangaro
8f818529a6 Remove right "accounting->access" & debug menu 2014-09-09 21:19:15 +02:00
aspangaro
7cc3fe9c95 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-09 20:41:19 +02:00
Laurent Destailleur
653d9d4167 Fix: ckeditor area is at wrong place 2014-09-09 15:33:41 +02:00
Laurent Destailleur
27ba1680bf Add field weeklyhours. 2014-09-09 15:29:54 +02:00
Laurent Destailleur
40686fde0d Fix: Bad td balance 2014-09-09 14:51:29 +02:00
Laurent Destailleur
f19e469b5f Work on feature to assign several users to an event. 2014-09-09 14:38:10 +02:00
Laurent Destailleur
9f2b0b4f29 Minor enhancement on agenda module.
Can filter on date of event.
Local calendar renamed into Internal calendar.
2014-09-09 12:28:35 +02:00
Laurent Destailleur
9e2a0cb671 Fix: debug of accountancy module 2014-09-09 09:46:57 +02:00
Laurent Destailleur
2fb806bfc2 Fix: duplicate entity encoding into select_array. 2014-09-08 23:08:59 +02:00
aspangaro
1223be1e5b Move language key into admin.lang file 2014-09-08 21:51:40 +02:00
aspangaro
289f46977b List financial journals into admin 2014-09-08 21:19:05 +02:00
aspangaro
56071cb142 Uniformize presentation of supplier index with customer index 2014-09-08 20:35:41 +02:00
aspangaro
70b8ccd441 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-09-08 20:18:45 +02:00
Raphaël Doursenaud
367d225d3e Fixed missing class include for task duplication 2014-09-08 16:13:29 +02:00
Raphaël Doursenaud
c5ccf2998b Fixed forgotten rename 2014-09-08 16:13:03 +02:00
Laurent Destailleur
a3bbf2aff9 Fix: Correct height of empty line for thirdparties combo list. 2014-09-08 12:05:24 +02:00
Laurent Destailleur
562c47dd62 Fix: colspan too low. 2014-09-08 12:00:25 +02:00