Commit Graph

53042 Commits

Author SHA1 Message Date
Ion Agorria
a5c5f9b10e New: Project WebServices 2016-04-07 22:08:50 +02:00
Laurent Destailleur
b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
d7f669b918 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-07 19:28:18 +02:00
Laurent Destailleur
39b61d6924 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
2016-04-07 19:27:53 +02:00
Laurent Destailleur
4092f5fa2f Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-07 19:24:49 +02:00
Laurent Destailleur
f7fb95cab8 FIX Box disabled because bugged 2016-04-07 19:24:29 +02:00
Laurent Destailleur
086345490d Generalize the set of trackid for everyemail sent by dolibarr. 2016-04-07 14:29:07 +02:00
Laurent Destailleur
1e6152eb53 FIX Missing a row when incoterm is on 2016-04-07 14:17:20 +02:00
Laurent Destailleur
7f129d14d7 Better responsive design 2016-04-07 14:08:38 +02:00
Laurent Destailleur
059466030a FIX Missing a new line into log of sent emails 2016-04-07 12:42:18 +02:00
Laurent Destailleur
2c829e7cb6 NEW Add picto on module list to show warning and if module is an
external module.
2016-04-07 11:50:45 +02:00
Laurent Destailleur
ee53a8b1a8 NEW Can filter modules on publisher 2016-04-06 16:45:22 +02:00
Laurent Destailleur
1a1dc39a6b Mark a duplicate function as deprecated 2016-04-06 14:53:14 +02:00
Laurent Destailleur
4e3985fbc5 NEW If option to see non stable modules is on, add a filter into module
list to filter on level (deprecated, experimental, development)
2016-04-06 13:27:46 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
Juanjo Menent
b59b758016 Merge pull request #4943 from atm-gauthier/NEW_multientity_for_project
NEW : project sharing in select_projetcs_list function
2016-04-05 17:48:23 +02:00
Juanjo Menent
8bdda85801 Merge pull request #4955 from fmarcet/3.9
FIX: Not removing code into vatrate.
2016-04-05 17:43:48 +02:00
Laurent Destailleur
f9d7c27bd2 FIX Export must use a left join to not loose lines 2016-04-05 17:17:40 +02:00
Laurent Destailleur
dd87195a07 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93 FIX Damn, where was the project ref ? 2016-04-05 17:11:44 +02:00
fmarcet
d3794bb145 FIX: Not removing code into vatrate. 2016-04-05 16:49:50 +02:00
Juanjo Menent
10df0e33d4 Merge pull request #4896 from grandoc/3.9
fix a lot of beug
2016-04-05 16:49:22 +02:00
Laurent Destailleur
e7adae13ca Code comment 2016-04-05 12:59:17 +02:00
Laurent Destailleur
3738dae38d NEW Add date_rum into table of thirdparty bank account. 2016-04-05 12:06:47 +02:00
Laurent Destailleur
0f0850664d FIX Remove duplicates of shipment modes 2016-04-05 11:47:52 +02:00
Laurent Destailleur
a0a31a3c94 Better responsive design for dictionnaries 2016-04-05 11:24:58 +02:00
Laurent Destailleur
2d102d3132 Bad translation key 2016-04-05 10:24:28 +02:00
Laurent Destailleur
a656e42d42 Missing translation 2016-04-05 10:16:07 +02:00
Laurent Destailleur
6c87dfafae FIX Bad translation key 2016-04-05 10:12:03 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Laurent Destailleur
76ad7f36b9 FIX Filter/search on extrafields on lists 2016-04-04 16:03:35 +02:00
Laurent Destailleur
592a041bc5 FIX Filter/search on extrafields on lists 2016-04-04 16:02:29 +02:00
Laurent Destailleur
5101c96223 Restore button to create object from the project view. 2016-04-04 15:25:08 +02:00
Laurent Destailleur
1d700cd286 Keep empty if field value has no value. 2016-04-04 13:26:48 +02:00
Laurent Destailleur
122cd200ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-04 13:24:36 +02:00
gauthier
e043aebfa1 NEW : project sharing in select_projetcs_list function 2016-04-04 11:05:12 +02:00
Laurent Destailleur
71ef9bc90f Merge pull request #4940 from IonAgorria/fix-facrec
Fix #4227: Change FactureRec superclass to CommonInvoice
2016-04-04 09:24:55 +02:00
Laurent Destailleur
21475b587d Merge pull request #4939 from marcosgdf/patch-2
Corrected PHP documentation of calcul_price_total function
2016-04-04 00:43:14 +02:00
Laurent Destailleur
30f27b6fac Merge pull request #4933 from frederic34/patch-10
FIX correctly retreive ref_customer
2016-04-04 00:36:49 +02:00
Laurent Destailleur
f3c032ba21 Merge pull request #4925 from frederic34/patch-9
Update llx_propal_merge_pdf_product.sql
2016-04-04 00:34:40 +02:00
Laurent Destailleur
bd4bdcea37 Merge pull request #4924 from frederic34/patch-8
FIX Remove sql error when creating table llx_usergroup_extrafields.sql
2016-04-04 00:33:23 +02:00
Laurent Destailleur
29fc94e416 Merge pull request #4923 from frederic34/patch-7
FIX Remove sql error when creating table llx_establishment.sql
2016-04-04 00:31:20 +02:00
Laurent Destailleur
f8fa2202ed Merge pull request #4921 from FHenry/3.9
Add hook parameters on New search Box
2016-04-04 00:25:56 +02:00
Laurent Destailleur
f36f33f71b Merge pull request #4915 from defrance/patch-117
Add contact hook on specific task contact page
2016-04-04 00:21:57 +02:00
Laurent Destailleur
cab1c0f5cd Merge pull request #4886 from apachler/develop
Added functionality to get project customer contact as contact_xx tags
2016-04-04 00:11:19 +02:00
Marcos García
fded7d3e9a Corrected PHP documentation of calcul_price_total function 2016-04-03 22:17:25 +02:00
Laurent Destailleur
89bc29ed45 Try to remove grey background when using jquery jmobile. 2016-04-03 21:08:03 +02:00
Ion Agorria
fbe0414a1f Change FactureRec superclass CommonInvoice 2016-04-03 21:02:19 +02:00
Laurent Destailleur
4ced5ed27f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-03 20:02:28 +02:00
Laurent Destailleur
cea48a8dd6 FIX bad translation language loaded
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00