Commit Graph

46065 Commits

Author SHA1 Message Date
Marcos García de La Fuente
b0e728251a Every line has a $rowid property 2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
c7919a8d08 Removed duplicated code 2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
ad72425291 Moved some variables from FactureLigne to CommonInvoiceLine 2015-03-04 10:37:43 +01:00
Laurent Destailleur
4c1d51bd39 phpcs 2015-03-04 02:28:16 +01:00
Laurent Destailleur
6f96d4cd5c Minimum style 2015-03-04 02:18:20 +01:00
Laurent Destailleur
2c3a412c3a Fix export extrafield on supplier orders 2015-03-04 02:08:51 +01:00
Laurent Destailleur
52425648bf NEW: When using transfer or correct stock from warehouse, after
recording we go back to the warehouse page.
2015-03-04 01:54:26 +01:00
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
Laurent Destailleur
107a16ed75 Work on timesheet module 2015-03-04 00:53:35 +01:00
Laurent Destailleur
fddbca50b1 Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of
tracking id into email.
2015-03-03 18:33:53 +01:00
Laurent Destailleur
35733c4c08 More comments 2015-03-03 17:47:17 +01:00
Laurent Destailleur
e667c3e916 Fix error management 2015-03-03 13:29:16 +01:00
Laurent Destailleur
7050ef6176 Fix parameter notolderthan was not effective 2015-03-02 17:56:37 +01:00
Laurent Destailleur
79023cddb0 Fix external calendar for users were not visible if no global calendar
was set.
2015-03-02 17:34:50 +01:00
Laurent Destailleur
73afe1513d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
48356005c3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-02 03:00:29 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Laurent Destailleur
1493e66d64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-02 02:39:29 +01:00
Laurent Destailleur
45a90b54fe Fix: param to set id of object into url must be id everywhere (except
company, it might be socid)
2015-03-02 02:14:18 +01:00
Laurent Destailleur
c0d0fa317b Merge pull request #2404 from frederic34/patch-3
Update card.php
2015-03-02 02:05:40 +01:00
Laurent Destailleur
5a541c4206 Forgot to commit one file 2015-03-02 01:39:08 +01:00
Laurent Destailleur
2f24622a7c NEW: Introduce TCPDI as replacement of FPDI. 2015-03-02 01:38:40 +01:00
Laurent Destailleur
ba98f6f94a Fix: Bad management of error 2015-03-02 01:05:12 +01:00
Laurent Destailleur
495d066cfc Merge pull request #2378 from aspangaro/develop-patch6
Update TCPDF library to 6.2.6
2015-03-02 00:45:50 +01:00
Laurent Destailleur
9b2a90b468 Fix: all home area pages has the search box first. 2015-03-02 00:43:17 +01:00
Laurent Destailleur
2dcbb6ada5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-02 00:41:57 +01:00
Laurent Destailleur
ef89ff6601 Merge pull request #2402 from aspangaro/develop-patch14
NEW: Add a search field and report on hrm area
2015-03-02 00:41:43 +01:00
Laurent Destailleur
0774669331 Update comment 2015-03-02 00:37:47 +01:00
Laurent Destailleur
f81cb81e67 Merge pull request #2405 from frederic34/patch-5
phpcs
2015-03-02 00:31:50 +01:00
Laurent Destailleur
ce8cbee5d2 Merge pull request #2399 from marcosgdf/misc
misc
2015-03-02 00:31:27 +01:00
Laurent Destailleur
50d8137618 Merge pull request #2384 from marcosgdf/better-practice
Better practice in getBrowserInfo
2015-03-02 00:28:40 +01:00
Laurent Destailleur
6d3381bfa0 Merge pull request #2398 from marcosgdf/deprecated
Marked getStaticMember as deprecated
2015-03-02 00:23:36 +01:00
Laurent Destailleur
7fc0c2b485 Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements
New add doc on project linked elements
2015-03-02 00:19:21 +01:00
Laurent Destailleur
a0f8b39250 Prepare code for a perday week timesheet input of time spent. 2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e Fix: we must use status to find label of status 2015-03-01 16:24:02 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
2015-03-01 16:13:22 +01:00
Laurent Destailleur
8a67a3af10 Fix missing one param 2015-03-01 16:12:55 +01:00
Laurent Destailleur
8a00109baf Fix: Several bugs int replenishment feature. 2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd Fix: Several bugs int replenishment feature. 2015-03-01 16:04:34 +01:00
Laurent Destailleur
5f29942257 Fix link missing icon 2015-03-01 14:03:14 +01:00
Laurent Destailleur
9b0dce2e34 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php
2015-03-01 13:58:56 +01:00
Laurent Destailleur
be033c1947 Fix bad position of html tags
Conflicts:
	htdocs/opensurvey/card.php
2015-03-01 13:54:24 +01:00
Laurent Destailleur
f6314dd3ad Fix bad position of html tags 2015-03-01 13:48:45 +01:00
Laurent Destailleur
f2fb040a9c Fix align 2015-03-01 13:48:00 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup
into a tpl file.
2015-02-28 20:14:26 +01:00
Laurent Destailleur
f8e9a38e5c Fix: Avoid empty table into setup when module are missing. 2015-02-28 19:37:44 +01:00
Marcos García de La Fuente
8dffe2a910 Corrected FunctionsLibTest:testGetBrowserInfo 2015-02-28 19:33:19 +01:00
Laurent Destailleur
51fff77355 Fix: time 0 must be different than time unknown. 2015-02-28 19:02:03 +01:00
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +01:00