2
0
forked from Wavyzz/dolibarr
Commit Graph

59608 Commits

Author SHA1 Message Date
Laurent Destailleur
a65170ba2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 14:16:19 +02:00
Laurent Destailleur
0c35bc5284 Standardize code 2018-05-10 14:15:52 +02:00
Laurent Destailleur
3c6d1ccbac Merge branch 'develop' into develop 2018-05-10 13:13:53 +02:00
Laurent Destailleur
a6966fe295 Update main.inc.php 2018-05-10 13:12:24 +02:00
Laurent Destailleur
70a185a9e6 Update main.inc.php 2018-05-10 13:11:52 +02:00
Laurent Destailleur
63b9384ef6 No transmormation of data objectid before calling trigger 2018-05-10 12:34:23 +02:00
Laurent Destailleur
2fb5de6136 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e Reorder permissions 2018-05-10 12:29:58 +02:00
Laurent Destailleur
ee11a46a66 Merge pull request #8766 from fmarcet/develop
NEW Add Date delivery and Availability on Propals List
2018-05-10 12:18:27 +02:00
Laurent Destailleur
d020741173 Merge pull request #8757 from bafbes/abb7004
New : Translate list elements in journal selection
2018-05-10 12:15:34 +02:00
Laurent Destailleur
fddd628f08 Merge pull request #8764 from hregis/develop_email
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-10 12:08:58 +02:00
Laurent Destailleur
f5f734e8ef Merge pull request #8756 from bafbes/abb7003
New : Translate accountancy journal menu entries
2018-05-10 11:58:26 +02:00
Laurent Destailleur
0bf1fe2908 Merge pull request #8753 from delcroip/patch-15
new: log message for missing translation
2018-05-10 11:56:56 +02:00
Laurent Destailleur
f476e3e304 Update translate.class.php 2018-05-10 11:56:49 +02:00
Laurent Destailleur
e1acc5f6d6 Merge pull request #8760 from ATM-Nicolas/fix_lines_drag_and_drop
FIX : Drag and drop lines with extrafields
2018-05-10 11:55:19 +02:00
Laurent Destailleur
9acd5f0446 Merge pull request #8761 from ATM-Nicolas/develop
FIX : Missing translations
2018-05-10 11:54:13 +02:00
Laurent Destailleur
afa9db2a88 Merge pull request #8752 from delcroip/patch-14
FIX Add properly the project models
2018-05-10 11:54:00 +02:00
Laurent Destailleur
842c6168a2 FIX #8762 2018-05-10 11:50:35 +02:00
Laurent Destailleur
4efc9f95cd FIX #8775 (try better fix) 2018-05-10 11:48:18 +02:00
Laurent Destailleur
32868421f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 11:41:30 +02:00
Laurent Destailleur
9e807c1c01 Merge pull request #8751 from wdammak/patch-7
Add models pdf to warehouse module
2018-05-10 11:41:03 +02:00
Laurent Destailleur
a4bd8f5722 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 11:39:40 +02:00
Laurent Destailleur
56b80d81dd Declare hook as addreplace hook 2018-05-10 11:39:29 +02:00
Laurent Destailleur
9077f18dd6 Update security.lib.php 2018-05-10 11:37:22 +02:00
Laurent Destailleur
8837193545 Merge branch 'develop' into permissions_hook 2018-05-10 11:36:08 +02:00
Laurent Destailleur
bc9eaaab84 Update security.lib.php 2018-05-10 11:34:20 +02:00
Laurent Destailleur
7be804dcf5 Update security.lib.php 2018-05-10 11:32:08 +02:00
Laurent Destailleur
0891766a3e Update security.lib.php 2018-05-10 11:31:27 +02:00
Laurent Destailleur
ea4c48047a All new hooks must be addreplace hooks 2018-05-10 11:30:27 +02:00
wdammak
c0e5132108 Documents generes movement warehouse 2018-05-09 15:07:11 +01:00
wdammak
e62426546d Add Documents generes 2018-05-09 15:02:46 +01:00
Ferran Marcet
70527e64c5 New: Add Date delivery and Availability on Propals List 2018-05-08 18:15:02 +02:00
Regis Houssin
415b7425fd NEW add pdf function to check if pdf file is protected/encrypted 2018-05-08 09:45:10 +02:00
Ferran Marcet
d1fd39936c Fix: Bug on invoice status list on left menu 2018-05-08 09:04:04 +02:00
ATM-Nicolas
fb9ace010f FIX : Missing translations 2018-05-07 17:16:20 +02:00
ATM-Nicolas
5bc9799bf1 FIX : Drag and drop lines with extrafields 2018-05-07 16:30:22 +02:00
Abbes Bahfir
fd9b6365a7 New : Translate list element in journal selection 2018-05-07 09:20:19 +01:00
Abbes Bahfir
de8bd3f886 New : Translate accountancy journal menu entries 2018-05-07 08:43:41 +01:00
wdammak
d038bf3e4b Merge pull request #8 from Dolibarr/develop
Update rep
2018-05-06 17:01:44 +01:00
delcroix Patrick
5ac2b51517 new: log message for missing traduction
It's often difficult to find out the missing translation
2018-05-06 17:29:30 +02:00
delcroix Patrick
a2c93e56ae fixAdd properly the project models
Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.
2018-05-06 13:36:37 +02:00
Laurent Destailleur
20c50e809d Start 6.0.8 2018-05-06 10:43:40 +02:00
Laurent Destailleur
5fe8249706 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
2018-05-05 23:22:04 +02:00
Laurent Destailleur
a842178689 Fix migration missing steps 2018-05-05 23:20:53 +02:00
Laurent Destailleur
7511ba52ae NEW Suggest link to pay online for customer orders 2018-05-05 22:20:33 +02:00
Laurent Destailleur
f15da0b980 Fix chart of account initial data for syscohada 2018-05-05 22:15:19 +02:00
Laurent Destailleur
c34bfc229b Fix syntax error 2018-05-05 19:39:58 +02:00
wdammak
fb81088a4b Add models warehouse and movement 2018-05-05 13:44:11 +01:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
2018-05-05 14:34:54 +02:00