Laurent Destailleur
971e23e006
Fix special_code was lost when updating line
2015-05-07 12:10:27 +02:00
Regis Houssin
5578151bad
Fix: add $object for use with triggers
2015-05-07 12:08:02 +02:00
Regis Houssin
85244ba8c9
Fix: add $object for use with triggers
2015-05-07 12:06:17 +02:00
Regis Houssin
9a32d7ec2f
Fix: add $object for use with triggers
2015-05-07 12:02:24 +02:00
Regis Houssin
c976d32e7d
Merge remote-tracking branch 'dolibarr/3.6' into 3.6
2015-05-07 11:46:05 +02:00
Regis Houssin
9ed658ab8f
Merge remote-tracking branch 'dolibarr/3.7' into 3.7
2015-05-07 11:44:36 +02:00
Regis Houssin
c6d841613b
Revert "Fix: use global $object instead parameter"
...
This reverts commit 4f8c485914
2015-05-07 11:42:35 +02:00
Regis Houssin
1b56144cb8
Revert "Fix: use global $object instead parameter"
...
This reverts commit 179309710c
2015-05-07 11:41:14 +02:00
Laurent Destailleur
f197a94f59
Fix duplicate log
2015-05-07 10:52:41 +02:00
Laurent Destailleur
cc5968fbd5
A more complete error message
2015-05-07 10:45:35 +02:00
Raphaël Doursenaud
040df3c922
Change low level access verification to a better high level one
2015-05-07 10:32:20 +02:00
Laurent Destailleur
b71e5a1025
Merge pull request #2673 from aternatik/fix_getentity
...
Fix : missing getEntity calls
2015-05-07 00:48:19 +02:00
Juanjo Menent
2707dcd283
Code fixes
2015-05-06 23:44:53 +02:00
Laurent Destailleur
36ebaf7a22
Clean code
2015-05-06 23:31:03 +02:00
Laurent Destailleur
b601a87a2a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-06 23:13:52 +02:00
Juanjo Menent
652ff9e67c
Commenting function
2015-05-06 23:13:33 +02:00
Laurent Destailleur
3a8cf17f3c
NEW Can edit list of prospect status for customers/prospects. Add a new
...
entry into dictionary table to manage list fo status.
Removed deprecated files.
2015-05-06 23:13:07 +02:00
fmarcet
e191fc41a3
FIX: Bug on order and supplier invoice numeration mask when use supplier
...
code
2015-05-06 21:39:06 +02:00
Juanjo Menent
7adbf033df
Merge pull request #2759 from fmarcet/3.7
...
FIX: Bug on order and supplier invoice numeration mask when use supplier
2015-05-06 21:37:15 +02:00
Maxime Kohlhaas
1cb7d284a5
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:29:58 +02:00
Maxime Kohlhaas
72c4337f4b
Fix : shipment PDF was not using generation params
...
Conflicts:
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/fiche.php
2015-05-06 21:18:31 +02:00
Juanjo Menent
5d65d666f7
Merge pull request #2778 from atm-maxime/3.6
...
Fix : shipment PDF was not using generation params
2015-05-06 21:00:49 +02:00
Juanjo Menent
33f98a4433
Merge pull request #2776 from aspangaro/develop-accountancy_patch1
...
Accountancy: add a button to purge search criteria on list
2015-05-06 20:53:46 +02:00
Juanjo Menent
ea95a461e2
Fix: Make propal pdf "azur" compatible with the two products images
...
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
2015-05-06 17:17:41 +02:00
Regis Houssin
4f8c485914
Fix: use global $object instead parameter
2015-05-06 16:46:12 +02:00
Regis Houssin
179309710c
Fix: use global $object instead parameter
2015-05-06 16:44:47 +02:00
Laurent Destailleur
e6e263d13f
Add field to manage reccuring events
2015-05-06 16:44:41 +02:00
Laurent Destailleur
8efe0143f9
FIX Adding 5 more choice link into survey module was not working with
...
chrome
2015-05-06 16:37:04 +02:00
Laurent Destailleur
45f36514ec
Add ansible example tools
2015-05-06 16:31:40 +02:00
Maxime Kohlhaas
42455f771a
Missing comments
2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
d2603d5308
Fix : shipment was not considered as billed after classifybilled function
2015-05-06 12:39:10 +02:00
Maxime Kohlhaas
b203263e91
Fix : shipment PDF was not using generation params
2015-05-06 12:16:36 +02:00
jfefe
e5f0ab9324
Missing required class
2015-05-06 01:39:28 +02:00
jfefe
d62d7a2fc7
PHPCS again
2015-05-06 01:25:56 +02:00
jfefe
24bf614061
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7
Fix PHPCS
2015-05-06 00:55:42 +02:00
Laurent Destailleur
db63a9783e
More responsive design
2015-05-06 00:29:39 +02:00
aspangaro
10a895f1bd
Accountancy: add a button to purge search criteria on list
2015-05-05 22:36:48 +02:00
Laurent Destailleur
4ce4529cd5
Revert "Remove useless variables for common object"
...
This reverts commit 82682dfc66
2015-05-05 22:09:58 +02:00
Laurent Destailleur
a4675010ac
Fix label
2015-05-05 22:08:53 +02:00
Laurent Destailleur
0410f29e81
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-05 21:59:06 +02:00
Laurent Destailleur
b0baed83fc
Prepare for email tracking
2015-05-05 21:50:48 +02:00
aspangaro
d06f1db7d0
Merge remote-tracking branch 'Upstream/develop' into develop-pagination
2015-05-05 21:42:34 +02:00
aspangaro
f092be58c8
New: Add visual pagination for use on tablet
2015-05-05 21:41:08 +02:00
Arnaud Aujon Chevallier
da8aaea343
Merge remote branch 'upstream/3.7' into 3.7-webservices-fix
2015-05-05 21:37:50 +02:00
Arnaud Aujon Chevallier
4fd8d6c05a
fix typo
2015-05-05 21:37:10 +02:00
Raphaël Doursenaud
7d08c95fcc
Updated unit test to reflect dol_delete_file changes
2015-05-05 21:15:54 +02:00
Raphaël Doursenaud
b91d1fa0ca
dol_delete_files(): removed unused variables
2015-05-05 21:15:53 +02:00
Raphaël Doursenaud
7b542731a1
Made test pessimistic by default
...
The test result was wrong if, for example, the path was wrong.
The unlink() function being never called, it returned the default true value even if it didn't
remove a file.
2015-05-05 21:15:53 +02:00
Juanjo Menent
dc01de8072
Merge pull request #2765 from aternatik/common_properties
...
Remove useless variables for common object
2015-05-05 20:27:52 +02:00
