Laurent Destailleur
dc0d12eccd
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7
Sync transifex
2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e
Fixed: Prices visible into stock tab.
...
Conflicts:
htdocs/product/stock/product.php
2015-01-12 18:26:11 +01:00
Laurent Destailleur
a77a604082
Fix: include custom dir so everybody has it.
2015-01-11 15:32:11 +01:00
Laurent Destailleur
6414f415a8
Files compatible with apache 2.4
2015-01-11 15:30:34 +01:00
Laurent Destailleur
c7b311349e
Files compatible with apache 2.4
2015-01-11 15:16:55 +01:00
Laurent Destailleur
9662879e52
Fixed: Permissions
2015-01-11 15:15:51 +01:00
Laurent Destailleur
e4b89779f7
Fixed: css conflict
2015-01-10 21:39:40 +01:00
Laurent Destailleur
dda12003d4
Fixed: User of creation was not visible.
2015-01-10 12:23:15 +01:00
Laurent Destailleur
30d1284379
Fixed: Missing ref_ext
2015-01-10 01:15:39 +01:00
Laurent Destailleur
87f70f2d22
Fixed: property must be called billed into web service.
...
Fixed: web service to create order was useless. it was not possible to
change status.
2015-01-10 01:07:18 +01:00
Laurent Destailleur
f7960ec104
Fixed: Upgrade are done several times
2015-01-09 23:19:18 +01:00
fentman
9049931ff0
Change to $listofcurrenciesbefore for GBP + AUD
...
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
2015-01-09 22:55:17 +01:00
Laurent Destailleur
27698e7f0f
Merge
2015-01-09 22:42:53 +01:00
Laurent Destailleur
dbcaeb01c0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
2015-01-09 22:40:45 +01:00
Laurent Destailleur
6e2901c8f0
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
2015-01-09 22:36:10 +01:00
Laurent Destailleur
32edb33411
Start 3.6.3
2015-01-09 22:32:25 +01:00
Laurent Destailleur
068ae7f0d4
- Fix: ref_ext was not saved when recording a customer order from web
...
service
2015-01-09 22:32:00 +01:00
Laurent Destailleur
f54e90c9cf
Better doc to install external modules.
...
Custom dir will be installed by default.
2015-01-09 13:00:10 +01:00
Laurent Destailleur
b220bb7b1d
Fixed: Size too low
2015-01-07 11:14:51 +01:00
Laurent Destailleur
f8792bdbc7
Fixed: Add opensurvey into list of reloaded modules for 3.7
2015-01-07 11:11:40 +01:00
Laurent Destailleur
4ee308c77b
Fixed: Filter lost after search on date
2015-01-06 20:58:23 +01:00
Laurent Destailleur
2bf2c8fce7
Restore all requets
2015-01-06 00:34:23 +01:00
Laurent Destailleur
033757aafd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-01-06 00:33:28 +01:00
Laurent Destailleur
4ce7a27dca
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2015-01-06 00:28:07 +01:00
Laurent Destailleur
a668d163fd
Repair corrupted data
2015-01-06 00:27:35 +01:00
Laurent Destailleur
b919318b53
Merge pull request #2213 from marcosgdf/opensurvey
...
Fixed error deleting survey comment
2015-01-06 00:21:32 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
Laurent Destailleur
908a95d83f
Merge pull request #2211 from marcosgdf/contract-fixes
...
Several Contract-related fixes
2015-01-06 00:18:51 +01:00
Laurent Destailleur
3f7aab93e5
Merge pull request #2204 from defrance69/patch-39
...
Update facture.php
2015-01-06 00:14:42 +01:00
Laurent Destailleur
e5f81b1fec
Merge pull request #2202 from defrance69/patch-38
...
Update facture.php
2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872
Merge pull request #2199 from altatof/3.6
...
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
2015-01-06 00:10:08 +01:00
Laurent Destailleur
561ace5b0c
Merge pull request #2219 from ndrosis/patch-11
...
Fix Lang for Check Payment Type
2015-01-06 00:07:38 +01:00
Laurent Destailleur
6a6c5c54f1
Merge pull request #2220 from aspangaro/3.7-Auguria
...
Add module accountancy expert in auguria menu
2015-01-06 00:07:26 +01:00
Laurent Destailleur
256cd68404
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-01-06 00:04:51 +01:00
Laurent Destailleur
3794c9305e
Fix: [ bug #1754 ] Error while installing 3.7
2015-01-06 00:04:23 +01:00
Laurent Destailleur
5032f88e9f
Merge pull request #2221 from aspangaro/3.7-Skype
...
Skype :: Better presentation
2015-01-05 23:52:28 +01:00
aspangaro
b4b5b35afa
Skype :: Better presentation
2015-01-04 20:17:49 +01:00
Laurent Destailleur
d8d01090cd
Fixed: Mark function as deprecated
2015-01-04 19:28:05 +01:00
Laurent Destailleur
c0b5b9f00b
Fixed: Removed deprecated function
2015-01-04 19:26:51 +01:00
Laurent Destailleur
48818ed2fd
Fixed: Quick solution to solve problem of unknown payment amount for
...
online subscription.
2015-01-04 15:40:01 +01:00
Laurent Destailleur
df3987fa10
Fixed: Bad url link with jquery mobile. We must add rel="external" on
...
all external links.
2015-01-04 14:51:16 +01:00
aspangaro
f14ea7b649
Add module accountancy expert in auguria menu
2015-01-03 15:07:54 +01:00
Drosis Nikos
68049a2f0e
Fix Lang for Check Payment Type
2015-01-02 18:10:47 +02:00
Laurent Destailleur
be34fcfa8a
Removed duplicate link making same thing
2014-12-30 21:33:56 +01:00
Laurent Destailleur
410c8e56c6
Better fix
2014-12-30 04:30:32 +01:00
Laurent Destailleur
3848daeab8
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
htdocs/product/stats/facture.php
2014-12-30 04:20:50 +01:00
Marcos García de La Fuente
a9a33479f1
Fixed error deleting survey comment
2014-12-29 03:44:03 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
2202380bc2
Improving ContratLigne documentation
2014-12-28 19:36:43 +01:00
