Commit Graph

60062 Commits

Author SHA1 Message Date
Darkjeff
97da70e583 bug lines supplier 2017-06-28 16:38:06 +02:00
Darkjeff
8182f5fb2a update journal and supplier lines 2017-06-28 16:35:14 +02:00
Laurent Destailleur
2f9cc1c919 Fix avoid errors with postgresql 2017-06-27 18:35:10 +02:00
Laurent Destailleur
d186aed96c Fix: date must be stored into a date field (error with pgsql).
import_key is reserved for "import" process.
2017-06-27 18:26:17 +02:00
Laurent Destailleur
5dd8d1c4ef Rename button to make clear for user that the export is not the real
journal but a temporary situation.
2017-06-27 17:56:45 +02:00
Laurent Destailleur
9c64ba6ad6 Fix closing } 2017-06-27 17:52:50 +02:00
Laurent Destailleur
aa2ea621c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 17:42:19 +02:00
Laurent Destailleur
adf281c4f3 Look and feel v6 2017-06-27 17:42:07 +02:00
Laurent Destailleur
ba30f80a03 Merge pull request #7062 from Darkjeff/develop
Update Accountancy Journals
2017-06-27 17:41:22 +02:00
Laurent Destailleur
5f00fb5df8 Merge pull request #7059 from jfefe/patch-13
Add missing end tag `form` into fichinter setup
2017-06-27 17:36:33 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
c213624c14 Fix migration into product_lot 2017-06-27 16:42:37 +02:00
Laurent Destailleur
1a860c42ee Look and feel v6 2017-06-27 16:42:11 +02:00
Laurent Destailleur
50bf1bb21f Fix error in count of qty in other shipments 2017-06-27 16:41:57 +02:00
Laurent Destailleur
77ba5a8c24 Fix reception of product interface 2017-06-27 14:02:01 +02:00
Darkjeff
cb0e7b200e Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-06-27 12:45:56 +02:00
Laurent Destailleur
1fafa4017d Fix test on currency name 2017-06-27 12:33:29 +02:00
Laurent Destailleur
32ff09123d Add more info on phpunit 2017-06-27 12:19:48 +02:00
Darkjeff
8146049b4d update bank journal
add in bookkeeping
add export control
correct some bug with salary
2017-06-27 12:12:25 +02:00
Laurent Destailleur
2f4749a7a2 Revert "Add php unit"
This reverts commit cb93770d6b.
2017-06-27 12:02:22 +02:00
Laurent Destailleur
3b7667292b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 11:59:40 +02:00
Darkjeff
618334ac42 update purchase journal
add in bookkeeping
add export control
2017-06-27 11:58:26 +02:00
Darkjeff
2e64db2556 update sells journal
add in bookkeeping
add export control
2017-06-27 11:44:18 +02:00
Laurent Destailleur
10eda66735 Fix alignement 2017-06-27 11:32:52 +02:00
Laurent Destailleur
92287ab18d Fix url suggested for bookmark did not always include params 2017-06-27 11:12:03 +02:00
Laurent Destailleur
08af9bf365 List before 2017-06-27 10:37:00 +02:00
Laurent Destailleur
267170b8d2 Fix mainmenu was not correctly set with auguria menu 2017-06-27 10:34:41 +02:00
Laurent Destailleur
34f3552dc7 Fix missing image of user 2017-06-27 04:31:29 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
jfefe
9b951c5d1b Add missing end tag form into fichinter setup
The setup for option `FICHINTER_PRINT_PRODUCTS` was broken.
2017-06-26 21:37:36 +02:00
Laurent Destailleur
75006f9970 Fix data 2017-06-26 13:30:14 +02:00
Laurent Destailleur
cb93770d6b Add php unit 2017-06-26 13:29:43 +02:00
Laurent Destailleur
3a6314b1a0 Fix data 2017-06-26 13:29:18 +02:00
Laurent Destailleur
2be848025f Fix parameter withcode of currency_name function. Add PHPUnit tests 2017-06-26 10:09:22 +02:00
Laurent Destailleur
4a21457b8a Fix position of page nb 2017-06-26 09:28:02 +02:00
Laurent Destailleur
85ce1f3332 Fix missing var init 2017-06-26 09:20:16 +02:00
Laurent Destailleur
0b7c768f29 FIX Usage of production mode with REST Api. 2017-06-25 18:18:17 +02:00
Laurent Destailleur
63dcdc3a03 Fix API was loading definition of all APIs at each call. 2017-06-25 17:09:08 +02:00
Laurent Destailleur
025db4ac97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-25 12:26:32 +02:00
Laurent Destailleur
8bfda8d4ee Code comment 2017-06-25 12:26:16 +02:00
Laurent Destailleur
e97a4d953d Merge pull request #7052 from hidupcloud/develop
FIX Fixing pages warning when value is null
2017-06-25 03:03:34 +02:00
Laurent Destailleur
059e361bd8 Merge pull request #7053 from defrance/patch-15
FIX $forceimgscaleheight instead $forceimgscalewidth
2017-06-25 03:01:53 +02:00
Laurent Destailleur
78ebffe4f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/install/fileconf.php
2017-06-25 02:31:38 +02:00
Laurent Destailleur
1b3544e794 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-25 02:28:38 +02:00
Laurent Destailleur
480587c826 Fix travis errors 2017-06-25 02:28:07 +02:00
Laurent Destailleur
6298436a1b Clean old lot numbers 2017-06-25 02:26:30 +02:00
Laurent Destailleur
778e581aca Fix: avoid warning on permission if there is only admin users 2017-06-24 22:14:04 +02:00
Laurent Destailleur
e6e8a014a3 Prepare 5.0.4 2017-06-24 21:39:01 +02:00
Laurent Destailleur
ab9be29356 Fix installers 2017-06-24 21:36:51 +02:00
BENKE Charlene
03cb850442 $forceimgscaleheight instead $forceimgscalewidth 2017-06-24 20:48:11 +02:00