Commit Graph

50060 Commits

Author SHA1 Message Date
Laurent Destailleur
e85921c82f Start to introduce sftp 2015-09-07 11:45:33 +02:00
Florian HENRY
7505537a3e Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-09-07 11:39:00 +02:00
aspangaro
5780d33f9b Merge remote-tracking branch 'Upstream/develop' into develop-64
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-06 22:00:52 +02:00
aspangaro
168b5a1125 Update language 2015-09-06 21:56:23 +02:00
aspangaro
671018c5cc New Accountancy Uniformize code & rename a constant 2015-09-06 21:53:28 +02:00
Marcos García de La Fuente
3c8d02b865 Removed unused variable 2015-09-06 20:49:11 +02:00
Marcos García de La Fuente
2f85d02911 Added missing RemiseCheque properties 2015-09-06 19:24:17 +02:00
Marcos García de La Fuente
c58b5a5117 Created CommandeFournisseur::hasDelay function 2015-09-06 19:23:46 +02:00
Marcos García de La Fuente
9ce8024f1e Merge remote-tracking branch 'upstream/develop' into refactor 2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
47e62f2270 Created FactureFournisseur::hasDelay function 2015-09-06 18:47:26 +02:00
Marcos García de La Fuente
f1ea19e09b Created ActionComm:hasDelay function 2015-09-06 18:26:48 +02:00
Laurent Destailleur
91ddca6ab0 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
2015-09-06 16:34:40 +02:00
Laurent Destailleur
822d4d1b39 Fix remove log 2015-09-06 15:06:13 +02:00
Laurent Destailleur
aaa639a3ab Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 15:00:17 +02:00
Laurent Destailleur
7c2b6e7780 Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
2015-09-06 14:55:29 +02:00
Laurent Destailleur
0d811dce6a Start to mutualize the builddoc and remove_file action. 2015-09-06 14:21:42 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
Laurent Destailleur
6c78b930d1 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-09-06 11:26:20 +02:00
aspangaro
e88d7076a6 Fix Problem with checked input when you edit a survey 2015-09-06 07:58:49 +02:00
aspangaro
1756862a65 Typo 2015-09-06 07:56:43 +02:00
aspangaro
a4a72d64c0 New: Accountancy Add message when general ledger is witten 2015-09-06 06:43:40 +02:00
aspangaro
b268ccf064 Fix #3455 In advanced accounting module, button transfer to general ledger don't work 2015-09-06 04:52:03 +02:00
Laurent Destailleur
8076ea85ea 3.6.4 was packaged 2015-09-05 20:07:17 +02:00
Laurent Destailleur
a21b015cbb Fix XSS 2015-09-05 20:03:02 +02:00
Laurent Destailleur
389cb00164 Prepare code to mutualise buildodc and remove_file 2015-09-05 20:02:38 +02:00
Raphaël Doursenaud
0a9f4a41f3 Qual: Removed dead code 2015-09-05 12:37:43 +02:00
Raphaël Doursenaud
97f91d0ef9 Fix #3440 Only search core modules in main path
Removed duplicated code and used common dolGetModulesDirs() function
2015-09-05 12:37:43 +02:00
Laurent Destailleur
873f33b8ab Missing translation 2015-09-05 11:22:14 +02:00
Laurent Destailleur
1b9b0082ba Merge pull request #3387 from defrance/patch-75
NEW: add intervention Aera
2015-09-05 11:19:37 +02:00
Marcos García de La Fuente
865489db75 Created Adherent::hasDelay function 2015-09-05 11:03:37 +02:00
Laurent Destailleur
d108881690 Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone
NEW : conf to use next product/service ref when we clone a product/se…
2015-09-05 10:57:11 +02:00
Marcos García de La Fuente
3c5159f497 Created Facture::hasDelay function 2015-09-05 10:56:13 +02:00
Laurent Destailleur
974ea7cd79 Merge branch 'patch-61' of https://github.com/defrance/dolibarr into develop
Conflicts:
	htdocs/core/tpl/contacts.tpl.php
	htdocs/societe/class/societe.class.php
2015-09-05 10:52:35 +02:00
Laurent Destailleur
9cf6b824d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-05 10:50:42 +02:00
Laurent Destailleur
6a9933d9af Update doc 2015-09-05 10:49:55 +02:00
Marcos García de La Fuente
3fbab48d81 Created Commande::hasDelay function 2015-09-05 10:42:54 +02:00
Laurent Destailleur
fbbea5b9e1 Merge pull request #3468 from GPCsolutions/composer
Updated composer links
2015-09-05 10:28:09 +02:00
Laurent Destailleur
c03d508bd3 Merge pull request #3467 from guerrierk/develop
NEW Adding Document tab into Bank Account
2015-09-05 10:26:51 +02:00
Laurent Destailleur
087938e340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/bank/class/account.class.php
2015-09-05 10:25:01 +02:00
Laurent Destailleur
ce17ee2b88 git push origin developMerge branch 'open-minds-patch-2' into develop 2015-09-05 10:23:06 +02:00
Laurent Destailleur
6ac4b8d0d4 Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2 2015-09-05 10:22:43 +02:00
Laurent Destailleur
4c0f117e55 Merge pull request #3465 from open-minds/patch-1
Fix detailed information of BBAN for Germany
2015-09-05 10:22:12 +02:00
Laurent Destailleur
25d89f3b2b Merge pull request #3469 from frederic34/patch-9
Typo
2015-09-05 10:21:33 +02:00
Frédéric FRANCE
132a464df6 Update product.php 2015-09-05 08:57:01 +02:00
aspangaro
ef7df3f261 New: Accountancy rename llx_accountingaccount in llx_accounting_account
Fix: language key
2015-09-05 08:03:06 +02:00
aspangaro
967a5b2a76 Merge remote-tracking branch 'Upstream/develop' into develop-62 2015-09-05 06:18:47 +02:00
aspangaro
f33cd85c04 New: refund VAT 2015-09-05 06:15:27 +02:00
Raphaël Doursenaud
04e33fc92b Updated composer links 2015-09-05 02:40:05 +02:00
Laurent Destailleur
304a71710e Fix not complete info 2015-09-05 00:57:11 +02:00
Laurent Destailleur
51c5e01290 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-05 00:48:56 +02:00