Commit Graph

44884 Commits

Author SHA1 Message Date
Laurent Destailleur
19dbf7e2c6 Merge pull request #2185 from marcosgdf/bug-1765
Fix: [ bug #1765 ] Unable to create a contract
2015-01-18 12:39:25 +01:00
Laurent Destailleur
ef802d9c39 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a Fixed: Better fix for backward compatibility 2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c Fixed: Backward compatibility 2015-01-18 11:50:53 +01:00
Laurent Destailleur
06eda34b56 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-17 16:40:53 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Juanjo Menent
0d4aad4111 Fix: PostgreSQL compatibilty
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
2015-01-16 17:59:58 +01:00
Laurent Destailleur
6a900598a3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-16 15:13:48 +01:00
Laurent Destailleur
41890d0a0b Fixed: Translation of module name and desc was not used for external
modules.
2015-01-16 14:38:00 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus
withdrawals.

Conflicts:
	ChangeLog
2015-01-15 10:00:52 +01:00
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e Fixed: use object 2015-01-15 03:11:06 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
4d67e6f4d4 Add ignore 2015-01-15 02:11:22 +01:00
Laurent Destailleur
ccfbd3614e Not nice looking 2015-01-15 02:09:28 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly
supported.
2015-01-13 22:13:15 +01:00
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