Commit Graph

44999 Commits

Author SHA1 Message Date
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
720caf8e31 Missing XPF currency 2015-01-31 12:19:06 +01:00
Laurent Destailleur
a35bd9a3e4 Fixed bad sql request 2015-01-31 00:27:11 +01:00
Laurent Destailleur
0ea4a5db7d Fixed: Error management on triggers 2015-01-31 00:08:45 +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
14be79d3e8 Better help
Bad var
2015-01-28 20:04:18 +01:00
Laurent Destailleur
9850b753fa Tooltip at wrong place. 2015-01-28 19:37:09 +01:00
Laurent Destailleur
ad6af14edd Fixed: Status was not visible if selected. 2015-01-28 19:27:56 +01: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
820fc3dbc9 Merge pull request #2276 from aspangaro/3.7
Correct link & typo
2015-01-25 18:13:29 +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
8fb6ade27a Fix drag and drop in agenda view 2015-01-25 17:49:11 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
aspangaro
68764ccea3 Debug 2015-01-25 15:35:34 +01:00
aspangaro
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +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
aab7aacccf Bad width 2015-01-23 18:41:53 +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
5306220e5e Fixed: Translation 2015-01-23 02:21:43 +01:00
Laurent Destailleur
2e7bfa856a Fixed: bad url 2015-01-22 23:49:32 +01:00
Laurent Destailleur
04afe935a5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6 Fixed travis errors 2015-01-22 21:46:22 +01:00
aspangaro
e9e552533f Correct link 2015-01-22 21:13:08 +01:00
aspangaro
467a274f76 Typo 2015-01-22 21:12:20 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +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
639d582a44 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 18:44:21 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
Laurent Destailleur
e31decb3cf Merge pull request #2271 from aspangaro/3.7
Correct link
2015-01-22 13:57:30 +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
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
Laurent Destailleur
3af67b414e Merge pull request #2267 from tiaris/3.6
add left joins on llx_c_actioncomm
2015-01-21 00:00:00 +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
8d0c8b888d Merge pull request #2263 from frederic34/patch-1
Use account defined in invoice for pdf doc
2015-01-19 15:31:26 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes
misc-fixes
2015-01-19 15:28:28 +01:00
Frédéric FRANCE
69bb4b7b0b Use account defined in invoice for pdf doc 2015-01-18 23:00:26 +01:00
Laurent Destailleur
1dd76e2ec0 Avoid request if possible 2015-01-18 19:15:23 +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
Marcos García de La Fuente
0b18ce5fc4 PHPDoc + missing return statements 2015-01-18 16:16:46 +01:00