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
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
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
philippe grand
9f798bc3fc fix : missing translation 2016-03-03 11:54:12 +01:00
Regis Houssin
6fd5334812 Fix: compatibility with multicompany transversal mode and more security 
issue
 2016-03-03 10:10:55 +01:00
Regis Houssin
25686e82c9 Fix: best compatibility with multicompany and others security issue 2016-03-03 08:49:24 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +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
Regis Houssin
057188e1de Fix: comment debug lines 2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24 Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2) 2016-03-02 11:23:57 +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
215b24df54 Merge pull request #4701 from atm-alexis/FIX_contract_fourn_price_deleted_on_update 
FIX contract line supplier data were deleted on update
 2016-03-02 01:04:39 +01:00
Laurent Destailleur
d39dca21d7 Add franc guinéen in currency 2016-03-01 22:48:35 +01:00
Alexis Algoud
72b532b7eb FIX non instanciated values 2016-03-01 11:31:27 +01:00
Laurent Destailleur
839b2074ce Merge pull request #4696 from aspangaro/3.9-p14 
Fix: 3.9rc2 Use getNomUrl to show account_parent instead of rowid of the accountancy account
 2016-03-01 01:47:56 +01:00
Laurent Destailleur
724f06a5eb Merge pull request #4694 from simnandez/3.9 
FIX : Remove bad migration file for this version
 2016-03-01 01:47:09 +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
Laurent Destailleur
a26f880843 Fix missing declarion of form 
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
 2016-03-01 00:59:42 +01:00
Frédéric FRANCE
10d04e63c1 Update bonprelevement.class.php 2016-02-29 22:59:08 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
a3d4340b82 Fix useless truncation 2016-02-29 15:30:52 +01:00
Laurent Destailleur
64374bec00 Fix avoid wrapping in select2 combo list 2016-02-29 15:28:06 +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
Laurent Destailleur
d2c71fbf8f Fix alias name was visible twice. 2016-02-29 10:35:18 +01:00
Laurent Destailleur
21c7aacddb Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to 
provide backward compatibility with old behaviour.
 2016-02-29 10:29:32 +01:00
fmarcet
77490bff71 FIX: Status filter don't work 2016-02-29 10:07:48 +01:00
Laurent Destailleur
4b28dadd6e More complete instruction to convert image to theme 2016-02-28 14:44:09 +01:00
Laurent Destailleur
b7e0faa332 More complete css 2016-02-28 14:01:21 +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
39d6d16c02 Fix bad picto "shared project" 2016-02-27 19:20:11 +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
d644a3bc43 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-02-27 18:43:50 +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
5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
 2016-02-27 18:33:39 +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
aspangaro
0136a1742e Spaces !!! 2016-02-27 16:21:59 +01:00
aspangaro
ba6dadb6fa Fix: Use getNomUrl to show account_parent instead of rowid of the account 2016-02-27 16:21:40 +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
aspangaro
1bf188db86 Fix: Double line 2016-02-27 14:34:32 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Juanjo Menent
cf932d6124 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-02-27 09:45:40 +01:00
Juanjo Menent
486488795a FIX : Remove bad migration file for this version 2016-02-27 09:44:48 +01:00
Juanjo Menent
2af7d3a635 Merge pull request #4693 from simnandez/3.9 
NEW : Add Malta VAT into 3.9
 2016-02-27 09:42:44 +01:00
Juanjo Menent
77173344fe NEW : Add Malta VAT into 3.9 2016-02-27 09:36:09 +01:00
aspangaro
7233adcede Merge remote-tracking branch 'Upstream/3.9' into 3.9-p13 2016-02-27 08:25:42 +01:00
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
aspangaro
41fb60e4a2 Fixed: comestic correction of company card 2016-02-27 06:38:48 +01:00
Juanjo Menent
c2c6d77caa FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:17:22 +01:00
Laurent Destailleur
4cf59d3f9b Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must 
not show unpaid orders.
 2016-02-26 19:13:25 +01:00
Laurent Destailleur
9a0af064bf Prepare rc2 2016-02-26 19:05:02 +01:00
Laurent Destailleur
4250fe155a Fix showing ref of shipment on orders (lines too long) 2016-02-26 15:42:07 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
2e25c7969b Fix when setting a price for a product, selection of product must not 
show any price
 2016-02-26 12:22:32 +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
7567336680 FIX #4683 2016-02-26 10:51:06 +01:00
Laurent Destailleur
b072b5a181 Fix remove some warnings 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-02-26 10:45:25 +01:00
Laurent Destailleur
cdcad62967 FIX Array of linked elements for PDF contains duplicates and missing 
data
 2016-02-25 18:19:20 +01:00
Laurent Destailleur
59a6cb5f55 Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT 
Conflicts:
	htdocs/commande/list.php
 2016-02-25 03:06:37 +01:00
Laurent Destailleur
a5c3658f53 Fix bad formatting of order / shipment ref on PDF 2016-02-25 02:45:27 +01:00
Laurent Destailleur
773e5e3b0a Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:03:37 +01:00
Laurent Destailleur
4b89b0b7aa Fix bad status translation for shipment 2016-02-24 22:13:29 +01:00
Laurent Destailleur
33d5fa38ef Fix pdfBuildThirdpartyName must return main name. Alias should be an 
option.
 2016-02-24 13:30:16 +01:00
Laurent Destailleur
490ef11eb5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-24 12:10:35 +01:00
Laurent Destailleur
5d1241be2f Sync transifex 2016-02-24 12:10:25 +01:00
Laurent Destailleur
ac6001cec8 Fix do not show warning if account defined 2016-02-23 12:44:46 +01:00
Juanjo Menent
6db0f01fa4 FIX : Bad Argentina provences 2016-02-22 19:53:39 +01:00
Laurent Destailleur
cfdaa0e13c Fix missing translation 
Fix import of state
 2016-02-22 14:49:30 +01:00
Laurent Destailleur
d128df1fe5 Fix js error .submit is not a function 2016-02-22 14:33:14 +01:00
Laurent Destailleur
dcdc53464d Fix select2 text color 2016-02-22 14:25:12 +01:00
Laurent Destailleur
8e83f4f15c Fix missing translation load 2016-02-22 13:52:01 +01:00
Laurent Destailleur
a08fa814ec Better filter to exclude mysqldump warning 2016-02-22 13:32:01 +01:00
Laurent Destailleur
762ab060e4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 13:28:18 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
6181ab4149 FIX Avoid to return an error due to mysql warning 2016-02-22 09:32:42 +01:00
Laurent Destailleur
e7e6957073 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7 Fix do not show warning if account defined 2016-02-22 09:27:18 +01:00
Laurent Destailleur
93b1b4c66e FIX #4580 2016-02-21 21:02:25 +01:00
Laurent Destailleur
54a4570b5f FIX #4580 2016-02-21 20:57:15 +01:00
Laurent Destailleur
110c5b537a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-21 20:04:18 +01:00
Laurent Destailleur
c1d7f5a7ed FIX #4633 2016-02-21 20:00:40 +01:00
philippe grand
6f6f2a0574 enhance code help translation 2016-02-20 11:18:02 +01:00
Laurent Destailleur
7def330f54 Fix missing error message and input lost in shipment create page 2016-02-20 03:58:52 +01:00
Laurent Destailleur
2e27319d1b Fix Removed not expected br 2016-02-20 03:42:29 +01:00
Laurent Destailleur
a2817049c9 Fix must show warning only if threshold defined. 2016-02-20 03:34:56 +01:00
Ion Agorria
fc8f1272d2 Fix line fetch not converting dates 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2016-02-20 02:34:01 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
12e6b52131 Merge pull request #4654 from aspangaro/3.9-p12 
Fixed: Members - Problem of tab & missing language file
 2016-02-20 02:28:48 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
aspangaro
d77a8bddcf Fixed: Members - Problem of tab & missing language file 2016-02-19 07:39:14 +01:00
Laurent Destailleur
cc524c8180 Fix bad picto 2016-02-19 04:41:29 +01:00
Laurent Destailleur
79bc7cf085 Fix showing description 2016-02-19 04:05:08 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00
Laurent Destailleur
b70f2f329c Fix bad position of form 2016-02-19 03:59:22 +01:00
Laurent Destailleur
9e11fd988d Fix: color of category when showing full path must use color of last 
element of path
 2016-02-19 03:32:02 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All 
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
 2016-02-19 02:41:00 +01:00
Laurent Destailleur
3b5ce32cb0 Code comment 2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580 Fix code comment 2016-02-19 01:45:52 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
BENKE Charlie
9fd22722ff left a space between clone and $object 2016-02-18 15:18:47 +01:00
Raphaël Doursenaud
dfe7c6f06f Fix #4649 Wrong parameters order 2016-02-18 12:21:11 +01:00
Laurent Destailleur
1a12eb33d6 Merge pull request #4639 from grandoc/3.9 
[quality] : better help
 2016-02-18 00:31:38 +01:00
Laurent Destailleur
7ba6754a55 Fix the missing button to record reception 2016-02-18 00:27:35 +01:00
Laurent Destailleur
5d2c189e0e Fix bad place of table 2016-02-17 23:45:25 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may 
be module is disabed). I replace with a message to choose list.
 2016-02-17 22:33:02 +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
philippe grand
03b9b65d93 [quality] : better help 2016-02-16 16:45:19 +01:00
Laurent Destailleur
14fb2c914a Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:41:55 +01:00
Laurent Destailleur
d8e173af03 Fix regression (class not found, css on hover broken) with try to manage 
contrast on categories.
 2016-02-16 15:01:28 +01:00
jfefe
841145678d Always check links color when background color is set onto category 2016-02-16 12:56:57 +01:00
jfefe
134c9d13bc FIX : check contrast of link when using background color for category 2016-02-16 12:45:18 +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
Laurent Destailleur
816195cb43 Merge pull request #4600 from aspangaro/3.9-p11 
Modifiy menu for accountancy module - New balance feature
 2016-02-15 13:55:51 +01:00
Laurent Destailleur
353fa7c2fc Little cleaning on how options ar shown 2016-02-15 07:12:23 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-15 01:19:57 +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
f1c9a6fe48 Merge pull request #4594 from grandoc/3.9 
default sort should be from A to Z
 2016-02-15 00:39:00 +01:00
Laurent Destailleur
0c4d44a86c Merge pull request #4591 from FHenry/3.9 
Accoutancy
 2016-02-15 00:35:24 +01:00
Laurent Destailleur
0d5f30f627 Merge pull request #4589 from frederic34/patch-8 
Update google_oauthcallback.php
 2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9 Merge pull request #4603 from GPCsolutions/3.9-4597 
FIX #4597 PHP 7 Uniform Variable Syntax
 2016-02-15 00:32:11 +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
3925ae0742 Fix: we loose ability to refresh contact list when changing a company on 
contact tab
 2016-02-14 23:54:07 +01:00
Laurent Destailleur
2fd01d71cf Fix #4548 Check on stock enough must be done according to warehouse 2016-02-14 22:20:42 +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
abb
2f99273734 fix:no transaction in this place 2016-02-14 20:51:36 +01:00
Laurent Destailleur
666a3d907d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-14 20:48:39 +01:00
Laurent Destailleur
b7ae5bac6f Fix: The text "All" is not appropriate. 2016-02-14 20:48:25 +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
Laurent Destailleur
9f75ac499f Merge pull request #4606 from frederic34/patch-9 
Update 3.8.0-3.9.0.sql
 2016-02-14 12:25:54 +01:00
Laurent Destailleur
d973596601 Merge pull request #4587 from frederic34/patch-7 
Update modOauth.class.php
 2016-02-14 12:21:03 +01:00
Laurent Destailleur
969314e731 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:32 +01:00
Laurent Destailleur
1c6d154a77 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:11 +01:00
gauthier
756b50b9d3 FIX : search product in customer product prices doesn't work 2016-02-12 12:06:23 +01:00
Frédéric FRANCE
ad534c90e6 Update 3.8.0-3.9.0.sql 2016-02-12 10:34:21 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
Laurent Destailleur
51cc252d4a Fix: submit was no more possible from keyboard 2016-02-11 15:47:47 +01:00
Laurent Destailleur
518080468e Fix button create template must be visible only if amount is != 0 2016-02-11 10:39:01 +01:00
aspangaro
f1a26cf54b Correct problem of merging for language file 2016-02-11 06:49:49 +01:00
aspangaro
87fee74fb1 Modify menu for accountancy module - New balance feature 2016-02-11 06:48:23 +01:00
aspangaro
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +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
39feb45779 default sort should be from A to Z 2016-02-10 12:15:22 +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
Florian HENRY
ef7e245432 g 2016-02-09 19:23:17 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Florian HENRY
05d7b14786 Accoutancy 2016-02-09 19:11:19 +01:00
Florian HENRY
61dc17f280 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-09 19:07:04 +01:00
Laurent Destailleur
7ef0415aca Small per enhancement 2016-02-09 15:57:24 +01:00
Laurent Destailleur
223195538a Return bad late or not status for order 2016-02-09 14:29:12 +01:00
Frédéric FRANCE
c28f977e02 Update printgcp.modules.php 2016-02-09 14:12:34 +01:00
Frédéric FRANCE
ffccd43aab Update oauth.php 2016-02-09 14:08:50 +01:00
Frédéric FRANCE
51da5ea1f0 Update printgcp.modules.php 2016-02-09 14:07:54 +01:00
Frédéric FRANCE
73041b0be5 Update google_oauthcallback.php 2016-02-09 14:05:05 +01:00
Frédéric FRANCE
5dd016c3bc Update modOauth.class.php 2016-02-08 17:55:29 +01:00
Laurent Destailleur
50eae967bc Fix disabled entries were no greyed 2016-02-08 17:48:14 +01:00
Sof
19b333f78b FIX : Typo 2016-02-08 14:48:05 +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
Florian HENRY
2991084061 fx accountancy 2016-02-08 10:50: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
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for 
search was not visible.
 2016-02-07 02:55:56 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
58f728eae5 Prepare 3.9rc 2016-02-06 15:11:45 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +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
713050bd57 Fix style on payment page 2016-02-05 12:46:41 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +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
0ae8a3398d Fix sql error when extrafields on contact 2016-02-05 10:56:45 +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
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
6f1ddd3ba4 Fix on ref not correctly initialized. 2016-02-03 02:29:19 +01:00
Laurent Destailleur
d85f7be1f5 FIX #4423 2016-02-03 02:06:12 +01:00
Laurent Destailleur
165771b652 FIX #4439 2016-02-03 01:46:30 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
Laurent Destailleur
ee4b437bff Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-03 01:20:23 +01:00
Laurent Destailleur
bbf15d6a5d FIX #4498 2016-02-03 01:20:06 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
Laurent Destailleur
1548be2614 Merge pull request #4549 from FHenry/3.9 
Accountancy module
 2016-02-02 17:15:01 +01:00
Laurent Destailleur
325c35d355 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-02 15:39:44 +01:00
Laurent Destailleur
43ac8b72a3 Merge pull request #4542 from aspangaro/3.9-p9 
New accountancy menu for auguria
 2016-02-02 15:32:32 +01:00
Laurent Destailleur
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
Florian HENRY
c1f084b448 Fix accountancy 2016-02-02 11:11:08 +01:00
Florian HENRY
2887eb8c70 fix accountancy 2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac Fix journal 2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7 Fix accountancy 2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +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
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
Laurent Destailleur
640adcc666 Missing translation 2016-01-31 21:23:30 +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
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
aspangaro
2fa01a1754 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9 2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
Laurent Destailleur
9a87d2bee5 Fix phpcs 2016-01-30 16:28:48 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +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
129f5aad8e Fix bad translation 2016-01-30 15:56:04 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 15:35:28 +01:00
Laurent Destailleur
6e69e99227 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:34:06 +01:00
Laurent Destailleur
5212303208 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00
Laurent Destailleur
cc7d105d88 Fix height in mapping impot step 2016-01-30 15:07:22 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6 
Fix: Some problems presentation on accountancy module
 2016-01-30 13:04:22 +01:00
Laurent Destailleur
09a24b8dd8 Merge pull request #4496 from frederic34/patch-9 
Text not initialized
 2016-01-30 12:24:40 +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
c77fcfd291 Merge pull request #4503 from fmarcet/3.9 
FIX: Not returning the correct multilevel price
 2016-01-30 12:05:32 +01:00
Laurent Destailleur
f79b1d06cb Merge pull request #4519 from FHenry/3.9 
FIX : set column paid on expense report when expense is paid
 2016-01-30 12:01:10 +01:00
Laurent Destailleur
e2d9989574 Merge pull request #4518 from FHenry/3.9_compta 
3.9 compta
 2016-01-30 12:00:20 +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
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
bobby
72e8680f7c FIX : set column paid on expense report when expense is paid 2016-01-28 13:57:40 +01:00
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +01:00
bobby
283412f489 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-28 13:12:57 +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
Laurent Destailleur
2141a2f8a1 Fix css 2016-01-28 12:44:04 +01:00
phf
6eecf2f29a FIX filter by socid if from customer card 2016-01-28 12:30:49 +01:00
Laurent Destailleur
83e8efa910 Fix picto private project was same than public project 2016-01-28 12:19:19 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
Laurent Destailleur
c8d232e056 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/card.php
 2016-01-28 12:18:25 +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
fmarcet
e3d8a9a8a4 FIX: Doesn't collect the value of the cost price correctly 2016-01-27 12:13:31 +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
fmarcet
eec8d30625 FIX: Not returning the correct multilevel price 2016-01-27 10:57:04 +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
d33548e32c Fix in md theme 2016-01-25 17:31:40 +01:00
Laurent Destailleur
0f70ccad50 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-25 15:39:16 +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
Frédéric FRANCE
9909918078 Text not initialized 2016-01-25 13:52:35 +01:00
bobby
71c407e670 add coala book keeping export 2016-01-25 12:43:47 +01:00
bobby
c286c4c6ec Accoutancy update 2016-01-25 12:39:21 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6 2016-01-24 07:04:20 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
bobby
50d2665b0e Fix travis 2016-01-23 19:42:40 +01:00
bobby
4dd56c52d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-23 19:39:33 +01:00
Laurent Destailleur
615ffe5417 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-23 12:28:34 +01:00
Laurent Destailleur
a841db1eeb FIX Purge of temp files was broken 2016-01-23 12:24:46 +01:00