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

45041 Commits

Author SHA1 Message Date
Marcos García de La Fuente
7cc1288bb2 FIX #4743 UI glitch in project summary page 
Close #4743
 2016-04-09 22:54:34 +02:00
Marcos García de La Fuente
1026484da1 FIX #4748 Supplier invoice payment confirmation amount is not translated 
Close #4748
 2016-04-09 22:48:42 +02:00
Marcos García de La Fuente
b2f922291f FIX #4851 Project selector in supplier invoices shows the project label twice 
Close #4851
 2016-04-09 22:38:58 +02:00
Marcos García de La Fuente
9169adf4ce FIX #4766 VAT not shown in supplier invoice popup 
Close #4766
 2016-04-09 22:34:55 +02:00
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
Laurent Destailleur
22f6e0e92d Merge pull request #4831 from fmarcet/3.9 
FIX: Not showing sellprice properly on product list
 2016-03-17 23:33:05 +01:00
Laurent Destailleur
a102dc29d4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:19:28 +01:00
Laurent Destailleur
fb16feb666 FIX Same term to create than other objects 2016-03-17 23:19:19 +01:00
Laurent Destailleur
76896e92a6 Merge pull request #4822 from atm-alexis/FIX_bad_function_name 
FIX # Bad function name setEventMessagess call on project delete
 2016-03-17 23:14:24 +01:00
Laurent Destailleur
c61110935d Merge pull request #4803 from aspangaro/3.9-p17 
FIX Missing language file loading
 2016-03-17 23:13:47 +01:00
Laurent Destailleur
2c4f01859c Merge pull request #4802 from grandoc/3.9 
[fix]: define  to avoid issue with external pdf models
 2016-03-17 23:13:13 +01:00
Alexis Algoud
19e3c1b089 FIX finished parameters not used 2016-03-17 16:35:23 +01:00
Regis Houssin
2642b710ea Fix: missing model selected 2016-03-17 15:56:03 +01:00
Regis Houssin
a2bb57e33b Fix: use clone instead dol_clone 2016-03-17 15:22:05 +01:00
Regis Houssin
ae16d6c45c Fix: missing color update 2016-03-17 15:11:57 +01:00
Laurent Destailleur
aa7eb4935c FIX VAT rate can be negative. Example spain selling to morroco. 2016-03-17 12:18:47 +01:00
Laurent Destailleur
1683609d9a FIX Check of EAN13 barcode when mask was set to use 13 digits instead of 
12
 2016-03-17 12:00:38 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Regis Houssin
d2d38f58bf Fix: beware with merges in conflict !! 2016-03-17 09:22:12 +01:00
philippe grand
a196a76132 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-17 09:21:32 +01:00
fmarcet
a1bc5dcc31 FIX: Not showing sellprice properly on product list 2016-03-16 16:35:07 +01:00
fmarcet
ad942afbf1 FIX: Not showing sellprice properly on product list 2016-03-16 16:30:59 +01:00
Laurent Destailleur
1ded08abef FIX When using option Price per level, when adding a predefined product, 
the vat for customer was not correctly set.
 2016-03-15 21:02:45 +01:00
Drosis Nikos
610249068d Fix syntax 
SQL error when ordering product list
 2016-03-15 12:48:46 +02:00
Alexis Algoud
19d7577267 FIX Bad function name call on delete 2016-03-15 11:14:51 +01:00
philippe grand
ac1b4a90de Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-15 10:24:01 +01:00
aspangaro
4167663491 Fix: 3.9 Problem of rowspan in edit mode 2016-03-15 06:53:17 +01:00
Laurent Destailleur
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +01:00
Laurent Destailleur
77c81397ea Version 3.9 final 2016-03-13 20:17:49 +01:00
aspangaro
5d88c10e94 Missing language file 2016-03-13 08:33:34 +01:00
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-13 01:11:42 +01:00
philippe grand
adc552d5ff Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-12 20:52:09 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
philippe grand
df1c5697be [fix]: define to avoid issue with external pdf models 2016-03-12 19:07:56 +01:00
Laurent Destailleur
e0809fc750 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/compta/facture.php
	htdocs/product/document.php
 2016-03-12 18:40:50 +01:00
Laurent Destailleur
bad07bc38c Fix dos and bom and end of line 2016-03-12 18:30:19 +01:00
Laurent Destailleur
ba8e11d521 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-12 18:26:16 +01:00
Laurent Destailleur
58988e4ad2 Fix not visible menu title 2016-03-12 18:22:44 +01:00
Laurent Destailleur
e3df749666 Merge pull request #4796 from hregis/3.8_bug 
Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines
 2016-03-12 11:47:05 +01:00
Laurent Destailleur
444fce0bd9 Prepare 3.7.4 2016-03-11 18:34:05 +01:00
Regis Houssin
7953f77b07 Fix: $fileparams is not defined 2016-03-11 18:08:27 +01:00
Florian HENRY
33c5658209 fix error return 2016-03-11 17:17:06 +01:00
Regis Houssin
f87bb1206e Fix: wrong fk_parent_line in credit note with invoiceAvoirWithLines 
option
 2016-03-11 15:42:14 +01:00
Laurent Destailleur
a9058df753 Fix bad field in select 2016-03-11 10:47:17 +01:00
Laurent Destailleur
7a5353efb2 Make things clearer about option MAIN_ENABLE_LOG_TO_HTML 2016-03-10 18:36:09 +01:00
Laurent Destailleur
3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
	htdocs/product/document.php
	htdocs/societe/commerciaux.php
 2016-03-10 15:03:53 +01:00
Laurent Destailleur
d6f3a5c046 Fix bad path 2016-03-10 15:01:39 +01:00
Laurent Destailleur
d663b28dac Fix no database structure change is allowed into minor versions 2016-03-10 13:49:13 +01:00
Laurent Destailleur
f742d4ec66 Fix code corrupting database 2016-03-10 13:46:52 +01:00
Laurent Destailleur
80805f78ea Disable too dangerous patch. Fix must be done by doing an insert only 
without creating/renaming databases.
 2016-03-10 13:43:09 +01:00
Laurent Destailleur
9463b26476 Merge pull request #4774 from marcosgdf/bug-multiprice 
Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation
 2016-03-10 13:35:27 +01:00
Laurent Destailleur
45ab31815b Merge pull request #4767 from grandoc/3.9 
fix : missing translation
 2016-03-10 13:34:09 +01:00
Laurent Destailleur
a61882d847 Sync transifex 2016-03-10 12:44:05 +01:00
Florian HENRY
b58e155a6f FIX : #4785 2016-03-10 12:22:49 +01:00
philippe grand
6aa10a84df Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-03-10 09:01:11 +01:00
Laurent Destailleur
c907ca85c9 Fix css 2016-03-08 20:32:41 +01:00
Laurent Destailleur
043abdce03 Fix sql error 2016-03-08 20:30:09 +01:00
Laurent Destailleur
9f3f477877 FIX Navigation in result 2016-03-08 20:21:16 +01:00
Laurent Destailleur
881eca9fe5 Fix search on product ref 2016-03-08 19:46:42 +01:00
Laurent Destailleur
6d9bec9de1 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-08 17:32:00 +01:00
Laurent Destailleur
71246c864a FIX Bad td balance and default checkbox value 2016-03-08 17:31:46 +01:00
Marcos García de La Fuente
d43d0bfec1 Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation 2016-03-08 12:16:32 +01:00
Florian HENRY
4bf2da4af7 revert SQL changes 2016-03-08 10:24:59 +01:00
Florian HENRY
a8e2b49c5b FIX : #4768 2016-03-08 10:22:31 +01:00
philippe grand
44d71c2bb4 fix : missing translation 2016-03-08 09:08:31 +01:00
Florian HENRY
002a3888f4 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-07 10:57:46 +01:00
Juanjo Menent
9865b0daa3 Merge pull request #4735 from aspangaro/3.9-p16 
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
 2016-03-06 14:46:24 +01:00
Juanjo Menent
7a65ebe2b4 Merge pull request #4733 from grandoc/3.8 
3.8
 2016-03-06 14:45:48 +01:00
Juanjo Menent
5fb6db9da3 Merge pull request #4732 from hregis/3.8_bug 
Fix: compatibility with multicompany transversal mode
 2016-03-06 14:45:21 +01:00
Laurent Destailleur
894953c275 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-06 12:40:11 +01:00
Laurent Destailleur
3dbe27030e FIX If all banks account are reconcilable to off, we must not show nb of 
transactions to reconciles.
FIX Switching status reconcile on-off was broken.
 2016-03-06 12:39:59 +01:00
Laurent Destailleur
896f60a478 hidden solution to solve files overwriting each other 2016-03-06 00:47:00 +01:00
Laurent Destailleur
886aa1f8b6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-06 00:39:25 +01:00
Laurent Destailleur
210d8435da FIX The part added with hidden option MAIN_DOC_USE_TIMING was included 
with a . instead of -. This make os think it is part of extension
instead of file name.
 2016-03-06 00:39:13 +01:00
Laurent Destailleur
15ecf98bcb Fix responsive on smartphone 2016-03-05 02:11:20 +01:00
Laurent Destailleur
7a1af17585 FIX Responsive of demo selection page was not working 2016-03-05 01:40:52 +01:00
aspangaro
ae472b932c Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account 2016-03-04 20:45:47 +01:00
Regis Houssin
5292920a84 Fix: don't see the sales representative of anothers entities 2016-03-04 17:10:42 +01:00
Regis Houssin
735a1c075e Fix: best sql request 2016-03-04 16:48:53 +01:00
philippe grand
8ba8182c64 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-03-04 16:32:33 +01:00
philippe grand
bd0320dea0 fix : missing traduction 2016-03-04 16:30:47 +01:00
Laurent Destailleur
a73b53ff9c Merge pull request #4728 from atm-ph/fix_send_mail_from_thirdparty 
Fix can't send mail to thirdparty contact if no mail defined on thirdparty card
 2016-03-04 16:18:15 +01:00
Laurent Destailleur
83ababeeac Merge pull request #4727 from hregis/3.8_fichinter 
Fix: wrong modelpdf var name
 2016-03-04 16:17:16 +01:00
Regis Houssin
967ae720ef Fix: compatibility with multicompany transversal mode 2016-03-04 15:51:34 +01:00
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
 2016-03-04 15:39:55 +01:00
Laurent Destailleur
ca1860a08b Merge pull request #4720 from hregis/3.8_bug 
Fix: compatibility with multicompany transversal mode and more security issue
 2016-03-04 15:34:24 +01:00
Laurent Destailleur
fcb8c09414 Merge pull request #4721 from grandoc/3.9 
fix : missing translation
 2016-03-04 15:31:35 +01:00
Laurent Destailleur
c00860fdd5 Merge pull request #4719 from hregis/3.9_holiday 
Fix: best compatibility with multicompany and others security issue
 2016-03-04 15:30:18 +01:00
Laurent Destailleur
b6fd2a665e Merge pull request #4718 from grandoc/3.8 
fix : missing translation
 2016-03-04 15:22:04 +01:00
Laurent Destailleur
e92318bc13 Better fix to manage several level of beta and rc 2016-03-04 15:21:26 +01:00
Laurent Destailleur
84d2078919 Merge pull request #4710 from hregis/3.9_bug 
Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2)
 2016-03-04 15:18:59 +01:00
Laurent Destailleur
9ffaf9b218 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-03-04 14:51:59 +01:00
phf
e03f4b4de9 Fix can't send mail to thirdparty contact if no mail defined on thirdparty card 2016-03-04 12:21:14 +01:00
Regis Houssin
f9d8aba325 Fix: wrong modelpdf var name 2016-03-04 11:48:46 +01:00
Laurent Destailleur
071ca6d1c4 Fix enable/disabled contract 2016-03-03 20:46:42 +01:00
Laurent Destailleur
8ea7effac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-03-03 20:42:12 +01:00
Laurent Destailleur
09a9546c14 FIX Can not disabled an opened service line in a contract 2016-03-03 20:41:56 +01:00
Laurent Destailleur
99553c8230 FIX Can not disable an opened service on a contract 2016-03-03 20:39:38 +01:00
Laurent Destailleur
7dc5fd334f Italian vat to 22 2016-03-03 19:21:17 +01:00
philippe grand
6851c3fdb0 fix : missing translation 2016-03-03 16:18:07 +01:00
philippe grand
4a3509d350 fix : missing translation 2016-03-03 16:09:19 +01:00