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

43255 Commits

Author SHA1 Message Date
Juanjo Menent
9f4ccfab95 FIX #3815 With higher quality 2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22 FIX #3815 With higher quality 2016-04-15 15:42:58 +02:00
Juanjo Menent
4446e6a36c FIX #3815 Call to undefined function local_by_date(). branch 3.8 2016-04-15 12:47:21 +02:00
Juanjo Menent
2d3b2c08b5 FIX #3815 Call to undefined function local_by_date(). branch 3.7 2016-04-15 10:56:03 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Maxime Kohlhaas
25dcca301f Fix VAT amount on credit note was > 0 when manually entered 2016-04-12 09:47:35 +02:00
Laurent Destailleur
d0e3d9db76 Merge pull request #4992 from altatof/fix_minimum_buying_price 
FIX: correct display of minimum buying price
 2016-04-11 19:17:09 +02:00
Laurent Destailleur
4d14f3e6f2 Merge pull request #4983 from marcosgdf/bug-4442 
FIX #4442 Missing translation in Banks menu
 2016-04-11 18:59:03 +02:00
Laurent Destailleur
46dd3c0cec Merge pull request #4982 from marcosgdf/bug-4737 
FIX #4737 Bank transacion type selector translation is cropped
 2016-04-11 18:58:26 +02:00
Christophe Battarel
292373cf84 forgot new discount field 2016-04-11 17:43:10 +02:00
Christophe Battarel
983b2c9a21 FIX: real min buying price 2016-04-11 17:40:47 +02:00
Christophe Battarel
791df0c9ea FIX: correct display of minimum buying price 2016-04-11 17:27:34 +02:00
Juanjo Menent
f25bf64257 Merge pull request #4978 from marcosgdf/bug-4851 
FIX #4851 Project selector in supplier invoices shows the project label twice
 2016-04-10 12:41:08 +02:00
Juanjo Menent
ddb1d06ad4 Merge pull request #4980 from marcosgdf/3.8 
FIX #4743 UI glitch in project summary page
 2016-04-10 11:56:37 +02:00
Juanjo Menent
e27def479f Merge pull request #4986 from marcosgdf/bug-4747 
FIX #4747 Missing UI background when registering a supplier invoice payment
 2016-04-10 11:54:27 +02:00
Juanjo Menent
be0b7c86ff Merge pull request #4985 from marcosgdf/bug-4742 
FIX #4742 Able to delete a supplier invoice with a registered payment
 2016-04-10 11:52:21 +02:00
Juanjo Menent
c3472f7879 Merge pull request #4984 from marcosgdf/bug-4424 
FIX #4424 Missing email of user popup in supplier orders area
 2016-04-10 11:51:36 +02:00
Juanjo Menent
4f5d96150a Merge pull request #4977 from marcosgdf/bug-4766 
FIX #4766 VAT not shown in supplier invoice popup
 2016-04-10 11:42:29 +02:00
Marcos García de La Fuente
15d9273751 FIX #4747 Missing UI background when registering a supplier invoice payment 
Close #4747
 2016-04-10 00:30:31 +02:00
Marcos García de La Fuente
af473df214 FIX #4742 Able to delete a supplier invoice with a registered payment 
Close #4742
 2016-04-09 23:29:19 +02:00
Marcos García de La Fuente
865f9defff FIX #4424 Missing email of user popup in supplier orders area 
Close #4424
 2016-04-09 23:08:47 +02:00
Marcos García de La Fuente
b9de3d5852 FIX #4442 Missing translation in Banks menu 
Close #4442
 2016-04-09 23:03:00 +02:00
Marcos García de La Fuente
3135cf720d FIX #4737 Bank transacion type selector translation is cropped 
Close #4737
 2016-04-09 22:59:12 +02:00
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
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
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
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
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
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
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
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
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
2a19326a3f FIX Missing database escaping on supplier price insert/update 2016-03-31 21:47:32 +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
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +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
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
660f825a34 Fix regression description line not visible 2016-03-19 19:25:28 +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
Alexis Algoud
19e3c1b089 FIX finished parameters not used 2016-03-17 16:35:23 +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
08c5fd2e36 FIX #4809 - Duplicate functions with different content 2016-03-14 14:38:30 +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
Laurent Destailleur
32d0f9a8d7 Prepare 3.6.7 2016-03-11 18:27:04 +01:00
Regis Houssin
7953f77b07 Fix: $fileparams is not defined 2016-03-11 18:08:27 +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
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
Florian HENRY
b58e155a6f FIX : #4785 2016-03-10 12:22:49 +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
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
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
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
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
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
b6fd2a665e Merge pull request #4718 from grandoc/3.8 
fix : missing translation
 2016-03-04 15:22:04 +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
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
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
philippe grand
74601a0b1d fix : missing translation 2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947 fix : missing translation 2016-03-03 15:45:42 +01:00
Regis Houssin
6fd5334812 Fix: compatibility with multicompany transversal mode and more security 
issue
 2016-03-03 10:10:55 +01:00
philippe grand
59c4559a78 fix : missing translation 2016-03-02 21:13:12 +01:00
Laurent Destailleur
7fbfbfc804 Merge pull request #4716 from marcosgdf/bug-4453-2 
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
 2016-03-02 20:59:08 +01:00
Laurent Destailleur
f7059d3490 Merge pull request #4712 from marcosgdf/bug-4434 
FIX #4434 Weird behaviour when enabling multiprices
 2016-03-02 20:56:03 +01:00
Laurent Destailleur
e50ab89bcd Merge pull request #4711 from marcosgdf/bug-4425 
FIX #4425 Missing "VAT" translation in supplier order popup
 2016-03-02 20:55:21 +01:00
Marcos García de La Fuente
6f5481896b FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field 
Close #4453
 2016-03-02 12:41:24 +01:00
Marcos García de La Fuente
7d336bd5d4 FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property 
Close #4414
 2016-03-02 11:43:55 +01:00
Marcos García de La Fuente
aa45734683 FIX #4434 Weird behaviour when enabling multiprices 
Close #4434
 2016-03-02 11:38:40 +01:00
Marcos García de La Fuente
123d6fb6e5 FIX #4425 Missing "VAT" translation in supplier order popup 
Close #4425
 2016-03-02 11:29:42 +01:00
Marcos García de La Fuente
e63ab857d8 FIX #4583 Incorrect call of Categories::containing throws a DoliDB error 
Close #4583
 2016-03-02 11:21:56 +01:00
Laurent Destailleur
2d6c2d4fa5 Merge pull request #4698 from fmarcet/3.8 
FIX: Status filter don't work
 2016-03-01 01:46:26 +01:00
Frédéric FRANCE
10d04e63c1 Update bonprelevement.class.php 2016-02-29 22:59:08 +01:00
Florian HENRY
50decb35cd Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-29 11:11:37 +01:00
Laurent Destailleur
2eaa21ea5c Fix minor css error (pixel size must have "px"). Compatibility with old 
behaviour.
 2016-02-29 10:50:52 +01:00
fmarcet
77490bff71 FIX: Status filter don't work 2016-02-29 10:07:48 +01:00
Laurent Destailleur
be9a144433 FIX Add a test to show bugged module with a bad declaration of 
dictionaries to avoid to see clean module to be breaked.
 2016-02-28 12:43:00 +01:00
Laurent Destailleur
6b7551c5d2 Fix: Introduce hidden option to disable feature than hangs when too much 
data
 2016-02-27 19:12:45 +01:00
Laurent Destailleur
193699a1b3 Fix duration format 2016-02-27 18:47:02 +01:00
Laurent Destailleur
1038e92354 FIX sql request and total for time spen for current month 2016-02-27 18:42:57 +01:00
Laurent Destailleur
15503f12b9 FIX Removed a bugged list. Fixed another one to not count data of 
previous year.
 2016-02-27 18:29:01 +01:00
Laurent Destailleur
526ea743e0 Fix: the view my task must show only task you are assigned to 2016-02-27 17:56:59 +01:00
Laurent Destailleur
9b308b9f68 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-27 15:50:18 +01:00
Laurent Destailleur
4dd50460d3 Fix MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error in name 2016-02-27 15:50:06 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Florian HENRY
9ef5d02459 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-26 11:19:10 +01:00
Laurent Destailleur
ac6001cec8 Fix do not show warning if account defined 2016-02-23 12:44:46 +01:00
Laurent Destailleur
93b1b4c66e FIX #4580 2016-02-21 21:02:25 +01:00
Raphaël Doursenaud
dfe7c6f06f Fix #4649 Wrong parameters order 2016-02-18 12:21:11 +01:00
Florian HENRY
d44c04877a Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-17 12:54:47 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Florian HENRY
49a33cb8f9 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-16 10:30:17 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
Laurent Destailleur
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-02-15 01:18:59 +01:00
Laurent Destailleur
a9aab7545e Merge pull request #4575 from altatof/fix_ttc_display 
FIX: add missing global def for ttc column
 2016-02-15 00:14:34 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE 
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
 2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee Doc comment 2016-02-14 21:58:54 +01:00
abb
834f0b20ae fix:no transaction in this place 2016-02-14 20:55:09 +01:00
Laurent Destailleur
cc174daa13 Prepare 3.8.4 2016-02-14 20:12:47 +01:00
Laurent Destailleur
b091d4e897 Merge pull request #4586 from hregis/3.8_bug 
Fix: missing signature and uniformize code between card and script
 2016-02-14 15:50:36 +01:00
Laurent Destailleur
e28c3a3ee7 Merge pull request #4585 from grandoc/3.8 
fix : Strict Standards: Only variables should be passed by reference
 2016-02-14 12:53:09 +01:00
gauthier
756b50b9d3 FIX : search product in customer product prices doesn't work 2016-02-12 12:06:23 +01:00
Florian HENRY
23e35a6012 update size of elementtype column into llx_actioncomm (module_subelement 
name can be longer than 32)
 2016-02-10 14:21:57 +01:00
philippe grand
d02f8393dc Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-02-10 11:43:33 +01:00
Laurent Destailleur
7ef0415aca Small per enhancement 2016-02-09 15:57:24 +01:00
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
philippe grand
a15d03a676 fix : Strict Standards: Only variables should be passed by reference 2016-02-08 10:06:32 +01:00
Laurent Destailleur
c4c7ea2f22 FIX Relative discount decimals are not saved 2016-02-08 02:49:19 +01:00
Laurent Destailleur
96bf59f065 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 19:21:59 +01:00
Christophe Battarel
7a6c7f10a6 FIX: add missing global def for ttc column 2016-02-05 19:14:40 +01:00
Laurent Destailleur
36a29872b1 Merge pull request #4559 from fmarcet/3.8 
FIX: Check stock of batch on shippment
 2016-02-05 18:41:01 +01:00
Laurent Destailleur
7044e62afa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064 All messages separated with , into errorsToString 2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6 Merge pull request #4573 from altatof/fix_ttc 
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
 2016-02-05 18:34:45 +01:00
Christophe Battarel
f0aef88589 better fix 2016-02-05 13:49:19 +01:00
Christophe Battarel
36c7697b63 FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 
3.7
 2016-02-05 13:43:06 +01:00
fmarcet
ede4453164 Fix: Avoid errors when batch stock is negative 2016-02-05 12:59:32 +01:00
fmarcet
01f2180822 Merge remote-tracking branch 'origin/3.8' into 3.8 2016-02-05 12:57:43 +01:00
Laurent Destailleur
e9ee816826 Merge pull request #4561 from fappels/3.8 
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify product
 2016-02-05 11:12:31 +01:00
Laurent Destailleur
c9c5484805 Merge pull request #4570 from frederic34/patch-8 
Update CMailFile.class.php
 2016-02-05 10:58:42 +01:00
Laurent Destailleur
69e0f1ebc3 Add log to help debug 2016-02-04 17:55:30 +01:00
Frédéric FRANCE
a656607122 Update CMailFile.class.php 2016-02-04 17:12:58 +01:00
Francis Appels
5f7cb75518 Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card 
removed inputs from update form also removed from update action
 2016-02-03 19:52:09 +01:00
fmarcet
6260c1ae9e FIX: Check stock of batch on shippment 2016-02-03 11:33:13 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
fmarcet
d6cda60ed1 FIX: Check stock of product by warehouse if $entrepot_id defined on shippings 2016-02-01 13:40:02 +01:00
fmarcet
acc9879c7c FIX: It doesn't check if there is enough stock to update the lines of orders/invoices 2016-02-01 13:05:14 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
dfd4d36bdf Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-30 15:57:09 +01:00
Laurent Destailleur
3591f51918 Merge pull request #4480 from hregis/3.8_bug 
Fix: for avoid conflict with "global $m" in memory.lib.php
 2016-01-30 12:22:47 +01:00
Laurent Destailleur
b27e31b3ae Merge pull request #4483 from marcosgdf/bug-4440-3 
Corrected typo of PR #4444
 2016-01-30 12:20:50 +01:00
Laurent Destailleur
e574ebe34c Merge pull request #4514 from hregis/3.8_bug2 
Fix: missing field "label"
 2016-01-30 11:57:28 +01:00
Laurent Destailleur
f5a4b9db31 Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid 
FIX filter by socid if from customer card
 2016-01-30 11:56:40 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
phf
6eecf2f29a FIX filter by socid if from customer card 2016-01-28 12:30:49 +01:00
Regis Houssin
8a80e06580 Fix: missing field "label" 2016-01-28 11:42:00 +01:00
Laurent Destailleur
20e110a882 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-27 18:48:06 +01:00
Laurent Destailleur
45656c18e8 Fix hover css 2016-01-27 18:47:52 +01:00
Christophe Battarel
1baf25de3c FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden 
constant
 2016-01-27 12:04:00 +01:00
Laurent Destailleur
fccecc902d Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2016-01-26 18:30:08 +01:00
Laurent Destailleur
5fd6057c6c FIX Deadlock situation. Can't edit anymore contract. 
FIX List of automatic events was not visible.
 2016-01-26 18:22:37 +01:00
Laurent Destailleur
25924f31ad Bad translation 2016-01-26 17:57:57 +01:00
Laurent Destailleur
33355c613a FIX When we make a direct assignement on a task to a user, we must check 
he is also assigned to project (and if not assign it)
 2016-01-26 17:50:57 +01:00
fmarcet
c2efee8a29 FIX: Contrat card don't consider user permissions to show active/unactive service button 2016-01-26 13:02:21 +01:00
Laurent Destailleur
feb114625d Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-25 15:37:55 +01:00
Laurent Destailleur
c1b6630c16 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/main.inc.php
 2016-01-25 15:37:04 +01:00
Raphaël Doursenaud
ed16699de6 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-25 15:32:08 +01:00
Laurent Destailleur
0814fa76f8 FIX CVE CVE-2015-8685 2016-01-25 15:26:52 +01:00
Laurent Destailleur
667651860d Fix sql injection #4341 2016-01-25 15:24:31 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
Laurent Destailleur
a841db1eeb FIX Purge of temp files was broken 2016-01-23 12:24:46 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Laurent Destailleur
627f606c4d Fix list of leave request was not showing label correctly. 2016-01-23 11:17:20 +01:00
Laurent Destailleur
2b96c8f205 FIX Noway to validate a leave request for some uer even if they have 
permission for.
 2016-01-23 11:05:06 +01:00
Laurent Destailleur
fac38db2bf Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update 
FIX bookmark's user change after update if the user isn't superadmin
 2016-01-22 16:42:59 +01:00
Laurent Destailleur
dadc24462a Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:14:39 +01:00
Laurent Destailleur
49a325e7ae Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:10:27 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Regis Houssin
2b7b7e014d Fix: for avoid conflict with "global $m" in memory.lib.php 2016-01-22 13:20:21 +01:00
Laurent Destailleur
50b0019ead A protection to avoid situation loosing all admin accounts 2016-01-22 11:54:14 +01:00
Laurent Destailleur
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
 2016-01-22 03:18:51 +01:00
Laurent Destailleur
56a4466b5b Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-22 03:04:22 +01:00
Laurent Destailleur
34c648b351 FIX #4418 2016-01-22 03:04:07 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
arnaud
9ce6e2938c FIX bookmark's user change after update if the user hasn't superadmin right 2016-01-19 09:46:27 +01:00
Laurent Destailleur
2386b79dfc FIX Option to disable meteo was not set correctly in edit mode 2016-01-18 14:49:15 +01:00