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

44935 Commits

Author SHA1 Message Date
Laurent Destailleur
507b9a2956 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-09 16:00:52 +02:00
Frédéric FRANCE
f90cffd74a Update nusoap.php 
re-establish user-agent
 2016-04-09 15:42:53 +02:00
Laurent Destailleur
234f3e331d Merge pull request #4962 from FHenry/3.8 
FIX : Template email must take care of position column
 2016-04-08 21:32:27 +02:00
Laurent Destailleur
2ffe06b1b3 Merge pull request #4965 from GPCsolutions/3.9-sentry 
Prevent sentry logging error with 3.9 update
 2016-04-08 21:31:32 +02:00
Laurent Destailleur
daa1aed363 Bad placeholder 2016-04-08 19:31:18 +02:00
Laurent Destailleur
80caf58866 FIX Default vat is not set correctly when an error occured and we use 
VAT identified by a code.
 2016-04-08 19:19:13 +02:00
Laurent Destailleur
5753f21745 Missing translations 2016-04-08 16:09:35 +02:00
Laurent Destailleur
eb7bba9568 Fix translation 2016-04-08 16:07:30 +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
Raphaël Doursenaud
9d6efde935 Prevent sentry logging error with 3.9 update 
Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.

Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.
 2016-04-07 17:16:42 +02:00
Florian HENRY
f62a45ddfc Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-04-07 14:16:38 +02:00
Florian HENRY
1f723cb8d0 FIX : Template email must take care of positino column 2016-04-07 14:16:10 +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
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
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
6a4ca98ad9 Merge pull request #4908 from altatof/fix_bad_rounding 
FIX: systematic rounding causes prices to be updated without reason
 2016-04-04 00:18:18 +02:00
Marcos García
fded7d3e9a Corrected PHP documentation of calcul_price_total function 2016-04-03 22:17:25 +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
Juanjo Menent
deeb6f604d Merge pull request #4905 from altatof/fix_margin_display 
FIX: dont retrieve new buying price on margin display
 2016-04-03 16:17:41 +02:00
Laurent Destailleur
3aeb579486 Fix bad link 2016-04-03 12:46:34 +02:00
Laurent Destailleur
066c793de2 FIX image extension must be in lower case 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:46:01 +02:00
Laurent Destailleur
c0b2d7405a FIX Generated thumbs must always use the png format so using thumbs can 
work.
 2016-04-02 14:46:04 +02:00
Laurent Destailleur
599b225489 FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:21:50 +02:00
Laurent Destailleur
be8384389f FIX Creation of thumb image for size "small" was not done. 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 14:20:21 +02:00
Frédéric FRANCE
d4529d19c7 Update facture.php 
ref_client in order
ref_customer in shipping
 2016-04-01 17:32:58 +02:00
Laurent Destailleur
be483bd787 FIX Some records were lost into margin per product report 2016-04-01 12:28:15 +02:00
Laurent Destailleur
feb35adbe1 FIX Missing clean of criteria 2016-04-01 12:04:07 +02:00
Laurent Destailleur
2a19326a3f FIX Missing database escaping on supplier price insert/update 2016-03-31 21:47:32 +02:00
Frédéric FRANCE
90e74b346e Update llx_propal_merge_pdf_product.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:13:38 +02:00
Frédéric FRANCE
125256c825 Update llx_usergroup_extrafields.sql 
No need IF NOT EXISTS at install time
 2016-03-31 17:11:17 +02:00
Frédéric FRANCE
1419b0e385 Update llx_establishment.sql 2016-03-31 17:06:10 +02:00
Florian HENRY
f567a2a0ce Search box hook 2016-03-31 12:50:40 +02:00
Florian HENRY
5d4c959d2e Add hook parameters on New search Box 2016-03-31 12:18:26 +02:00
Laurent Destailleur
a47accb1c3 FIX PMP is deprecated at warehouse level 2016-03-30 18:08:08 +02:00
Laurent Destailleur
7146a8319b FIX Each time we edit a line, we loose the unit price. 2016-03-30 16:26:34 +02:00
Laurent Destailleur
fa10f9e030 FIX #4880 2016-03-30 14:07:07 +02:00
Laurent Destailleur
07e622a7f8 Introduce () to have code cleaner 2016-03-30 14:04:22 +02:00
Marcos García de La Fuente
362bc106eb FIX Multiprice generator didn't recalculate prices if only the price_base_type property changes 2016-03-30 11:40:57 +02:00
Laurent Destailleur
fce54e9c48 Fix tooltip too large 2016-03-29 12:49:41 +02:00
Christophe Battarel
024f55d461 FIX: systematic rounding causes prices to be updated without reason 2016-03-29 12:02:36 +02:00
Christophe Battarel
b8f3264f60 FIX: dont retrieve new buying price on margin display 2016-03-29 11:37:35 +02:00
philippe grand
85cd818da1 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-27 10:50:37 +02:00
philippe grand
b3285996dc fix travis issue from commit 139dc9a7 2016-03-26 12:39:08 +01:00
Laurent Destailleur
0715353960 FIX A not enabled field for list must not into fields to add 2016-03-25 19:44:18 +01:00
philippe grand
08970e67d7 fix a lot of beug 2016-03-25 18:16:58 +01:00
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +01:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Laurent Destailleur
9ddae7d7f3 Fix bad hook function name 2016-03-25 16:17:01 +01:00
Laurent Destailleur
f251ca579b Fix bad hook function name 2016-03-25 16:15:35 +01:00
Laurent Destailleur
7430d09739 Fix bad hook function name 2016-03-25 16:13:22 +01:00
Laurent Destailleur
5e55f0ecce Fix bad function name into hook 2016-03-25 16:07:42 +01:00
Laurent Destailleur
4e1b46feeb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-25 14:42:30 +01:00
Laurent Destailleur
bdead30e75 FIX Missing function 2016-03-25 14:42:16 +01:00
Regis Houssin
b38e75c404 Merge branch '3.8_fix_merge' into 3.9_fix_merge 2016-03-23 14:03:35 +01:00
fmarcet
b8bc881e5a FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:57:17 +01:00
fmarcet
84e5c8b437 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:56:06 +01:00
fmarcet
e2b4d39292 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:54:39 +01:00
fmarcet
52d88db5c3 FIX: Email templates not compatible with Multicompany 
Conflicts:
	htdocs/admin/dict.php
 2016-03-23 13:53:18 +01:00
Laurent Destailleur
8189a5eadd Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-22 12:58:34 +01:00
Laurent Destailleur
4f3f1eda7b FIX Duplicate records into export 2016-03-22 12:55:29 +01:00
Laurent Destailleur
876484dfb5 FIX Duplicate records into export 2016-03-22 12:54:26 +01:00
Laurent Destailleur
99ceb006e4 FIX Bad include and param for project numbering module call 2016-03-21 11:47:32 +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
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
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
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
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
c5e744bfc2 FIX #4839 2016-03-18 12:16:40 +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
Laurent Destailleur
dc78cc7ced Merge pull request #4837 from hregis/3.9_order 
Fix: missing model selected
 2016-03-18 00:10:30 +01:00
Laurent Destailleur
e201357907 Merge pull request #4817 from aspangaro/3.9-p19 
Fix: 3.9 Problem of rowspan in edit mode on user card
 2016-03-18 00:02:19 +01:00
Laurent Destailleur
18804ee929 FIX Bad color of message password changed 2016-03-18 00:01:14 +01:00
Laurent Destailleur
75ed221fb8 Fix regression with last PR: change of password was not working. 2016-03-17 23:58:04 +01:00
Laurent Destailleur
404ac60226 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:45:29 +01:00
Laurent Destailleur
bbcc7d83ea Merge pull request #4834 from hregis/3.9_bug 
Fix: beware with merges in conflict !!
 2016-03-17 23:44:49 +01:00
Laurent Destailleur
e5f0027dbf Merge pull request #4823 from ndrosis/3.9 
FIX SQL syntax error in export
 2016-03-17 23:37:23 +01:00