Commit Graph

6587 Commits

Author SHA1 Message Date
Laurent Destailleur
6976aec04b Merge pull request #2289 from accett/patch-2
Currency symbol in Mexico
2015-01-31 19:40:57 +01:00
Laurent Destailleur
2788a352cf Missing lang loading 2015-01-31 19:00:00 +01:00
Laurent Destailleur
d32f52cc50 Fix date of delivery, and avoid duplicate tracking number. 2015-01-31 16:23:23 +01:00
Laurent Destailleur
ce8ad39a8e Remove test code and restore prod code. 2015-01-31 13:00:51 +01:00
Laurent Destailleur
d6dc495a42 Removed bad print 2015-01-30 16:01:56 +01:00
Laurent Destailleur
67c1ae8593 Fixed: condition to show menus 2015-01-30 15:47:27 +01:00
Laurent Destailleur
ad6af14edd Fixed: Status was not visible if selected. 2015-01-28 19:27:56 +01:00
AcceTT Soluciones Computacionales
608b099934 Currency symbol in Mexico
I tried to change the order of the currency symbol in Mexico is before.
2015-01-26 21:38:43 -06:00
Laurent Destailleur
ffde00de81 Fixed date change was lost when changing event assignement. 2015-01-26 10:31:41 +01:00
Laurent Destailleur
da9f13bca9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-25 22:30:05 +01:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration.
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
Laurent Destailleur
b926a77325 Merge pull request #2280 from aspangaro/3.7-Accountancy
FIXED Accounting module - Align integrate core version & module version 3.6
2015-01-25 17:53:17 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
Laurent Destailleur
a4990a58b1 The badge was missing for shipment 2015-01-23 18:39:40 +01:00
Laurent Destailleur
083cf06908 Fixed: Tracking number restored on PDF shipments
Fixed: Translation
2015-01-23 18:33:33 +01:00
Laurent Destailleur
0f7238937a Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/fourn/commande/fiche.php
2015-01-22 18:55:26 +01:00
Laurent Destailleur
4bb86717cf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2 Fixed: Allow external module a chance to fix regression. 2015-01-22 12:29:55 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0 add left joins on llx_c_actiocomm 2015-01-20 17:26:32 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes
misc-fixes
2015-01-19 15:28:28 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
55b8c28100 Corrected weird typo 2015-01-18 16:28:42 +01:00
Laurent Destailleur
7b7b8f376f Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1784

Conflicts:
	ChangeLog
2015-01-18 15:13:26 +01:00
Laurent Destailleur
d1e2ab6f56 Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1783

Conflicts:
	ChangeLog
2015-01-18 15:10:30 +01:00
Laurent Destailleur
c35de1aa06 Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1803

Conflicts:
	ChangeLog
2015-01-18 15:01:18 +01:00
Laurent Destailleur
b1f889e1d1 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 12:46:23 +01:00
Marcos García de La Fuente
71e5cf07c6 Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes 2015-01-18 03:12:46 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
Marcos García de La Fuente
dacec491ff Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON 2015-01-17 19:37:49 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +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
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +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
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
Marcos García de La Fuente
4da52cf733 Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date 2015-01-13 11:11:37 +01:00
Laurent Destailleur
e4b89779f7 Fixed: css conflict 2015-01-10 21:39:40 +01:00
Laurent Destailleur
c441aa89db Fixed: Avoid warning 2015-01-10 18:19:44 +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
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
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
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
aspangaro
f14ea7b649 Add module accountancy expert in auguria menu 2015-01-03 15:07:54 +01:00
Laurent Destailleur
be34fcfa8a Removed duplicate link making same thing 2014-12-30 21:33:56 +01:00