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

45524 Commits

Author SHA1 Message Date
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Juanjo Menent
fbe34e9efc Merge pull request #4860 from aspangaro/4.0-p2 
NEW: Move Expense report menu from module to menu files
 2016-03-21 21:27:55 +01:00
Juanjo Menent
c323948669 Merge pull request #4856 from marcosgdf/pdf-phpdoc-fix 
Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters
 2016-03-21 20:40:07 +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
Juanjo Menent
19f6f7049d Merge pull request #4850 from fentman/patch-2 
Update main.lang
 2016-03-21 20:31:25 +01:00
Juanjo Menent
022958c8ad Merge pull request #4861 from aspangaro/4.0-p3 
FIX: Some typo on auguria menu
 2016-03-21 20:27:36 +01:00
Juanjo Menent
187a04854f Merge pull request #4862 from marcosgdf/form-selectarray2 
Corrected non-static usages of several Form functions
 2016-03-21 20:21:29 +01:00
Juanjo Menent
5fabb7b1e1 Merge pull request #4865 from aspangaro/3.9-p20 
FIX: Donation || Don't show project icon if fk_project is empty
 2016-03-21 20:12:32 +01:00
aspangaro
8f1cbe9ed8 FIX: Donation || Don't show project icon if fk_project is empty 2016-03-21 12:59:30 +01:00
Laurent Destailleur
d4f5076a84 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-20 17:37:50 +01:00
Laurent Destailleur
706a7f05b8 FIX PHPCS 2016-03-20 17:37:27 +01:00
Laurent Destailleur
6b821f15d1 FIX Bad vat definition when using POS module 2016-03-20 17:36:13 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
a0926abd13 NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm 2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5bdc3b9a1e NEW Converted Form::selectyesno, Form::showrefnav, Form::select_date, Form::showbarcode, Form::showfilterAndCheckAddButtons, Form::editfieldkey, Form::editfieldnav, Form::editInPlace, Form::selectMassActions to static functions 2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5a9e686bf9 NEW Converted Form::selectyesno to a static function 2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
ff6b187ef3 NEW Converted Form::showLinkedObjectBlock to a static function 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f Corrected non-static usages of Form::multiselectarray function 2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15: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
8689240b7f Merge remote-tracking branch 'origin/3.9' into develop 2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a Fix first change to fix serious pb with vat definition when using the 
POS.
 2016-03-19 21:35:03 +01:00
Marcos García de La Fuente
39d17c0132 Corrected PHPDoc blocks of pdf.lib.php functions and added typehinting in their parameters 2016-03-19 20:05:13 +01:00
Laurent Destailleur
ba4f5c8648 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-19 19:26:57 +01:00
Laurent Destailleur
ee857055be Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34 Fix regression description line not visible 2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:15:23 +01:00
Laurent Destailleur
d09faadc24 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-19 19:14:03 +01:00
Laurent Destailleur
f0eb8ac794 Fix regression Product ref not visible 2016-03-19 19:13:27 +01:00
Laurent Destailleur
2639554cff Clean css for POS. Start to move css into theme. 2016-03-19 18:46:44 +01:00
Michael Fenton
51125483aa Update main.lang 
Changing 'Quadri' to Quarter..
 2016-03-19 20:03:26 +11:00
Laurent Destailleur
558d03c371 Add the "now" link on date to pay vat 2016-03-18 19:44:40 +01:00
Laurent Destailleur
101e5ae4c6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-18 19:43:09 +01:00
Laurent Destailleur
b4e775dd35 FIX Parsing of amount to pay vat 2016-03-18 19:42:56 +01:00
Josep Lluís
31fa9221dd Change of wrong key "Firsname" translation 
Change of wrong key "Firsname" to "Firstname" for translation
 2016-03-18 16:47:28 +01:00
Laurent Destailleur
bc377258e1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-18 15:02:49 +01:00
Laurent Destailleur
6f8200893b FIX #4784 2016-03-18 15:02:37 +01:00
Laurent Destailleur
5eef373ed6 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/user/card.php
 2016-03-18 14:56:44 +01:00
Laurent Destailleur
2f5c190060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-18 14:53:27 +01:00
Laurent Destailleur
227e27bf4a Merge pull request #4845 from simnandez/3.9 
FIX: Can not select a commercial on the creation of a third
 2016-03-18 14:17:08 +01:00
Laurent Destailleur
fb625f0ca7 FIX #4812 2016-03-18 13:58:06 +01:00
Juanjo Menent
875f4023de FIX: Can not select a commercial on the creation of a third 2016-03-18 13:16:33 +01:00
Laurent Destailleur
97b630ac65 NEW Can use ^ and $ (to say start with or end with like regex syntax) 
into search fields when search field is text. Bonus: ^$ can filter all
lines with field not defined.
 2016-03-18 12:42:13 +01:00
Laurent Destailleur
c5e744bfc2 FIX #4839 2016-03-18 12:16:40 +01:00
BENKE Charlie
830f78b1c6 FIX : hookmanager must be init 
Else we can't use is on additionnal modules
 2016-03-18 11:55:41 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
5edeeae384 FIX Bad error and style message when changing its own login 2016-03-18 11:30:15 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00