2
0
forked from Wavyzz/dolibarr
Commit Graph

69068 Commits

Author SHA1 Message Date
Laurent Destailleur
6a76242611 Fix record with date_creation empty 2018-04-30 08:59:07 +02:00
Julien BARRET
bb2ef46ef4 Reactivate next and previous link 2018-04-30 00:24:47 +02:00
Julien BARRET
b099d834a0 Fix bug : when click on refresh button, next and previous button are broken.
Eg. in year 2018, next button point to year 4032!
2018-04-29 23:26:44 +02:00
Julien BARRET
efcc3f40fa Fix link "refresh" on turnover report 2018-04-29 23:22:46 +02:00
Laurent Destailleur
984ef37ff5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:19:05 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
9a345e99ef Fix syntax error 2018-04-29 20:14:57 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
98ff3868a9 Fix translation 2018-04-29 20:11:17 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
e168240ab0 Debug module DAV 2018-04-29 18:32:15 +02:00
Laurent Destailleur
8b4ef1313a FIX API for tickets 2018-04-29 18:24:24 +02:00
Laurent Destailleur
aafab12f4b Debug API for ticket module 2018-04-29 18:06:31 +02:00
Laurent Destailleur
1a9476bff5 Fix edition of label of a vat payment. 2018-04-28 20:17:39 +02:00
Laurent Destailleur
e72c2e6a11 Enhance sorting of field for lists on field with several sort criterias 2018-04-28 19:54:41 +02:00
Laurent Destailleur
2241418b33 Fix look and feel v7 2018-04-28 18:43:29 +02:00
Laurent Destailleur
e8fd5ea5cd Better translation 2018-04-28 17:18:38 +02:00
Laurent Destailleur
94d6e178f7 Work on vat report code rewrite 2018-04-28 16:06:46 +02:00
Laurent Destailleur
07b9a9b44d Better US english 2018-04-28 13:08:09 +02:00
jfefe
7cedf55c27 FIX : missing english name for object
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
2018-04-27 20:54:48 +02:00
Laurent Destailleur
257dc1cf77 Work on rewriting VAT reports 2018-04-27 19:17:34 +02:00
Laurent Destailleur
c35a190f1d update some tools 2018-04-27 13:31:11 +02:00
Laurent Destailleur
e94d5b8318 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-27 12:51:57 +02:00
Laurent Destailleur
c50700470b Remove deprecated file 2018-04-27 12:51:39 +02:00
Laurent Destailleur
3b473943dc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-27 12:44:07 +02:00
Laurent Destailleur
a80621471c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
2018-04-27 12:42:18 +02:00
Laurent Destailleur
e5df7e206b Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal
Fix wrong price on supplier order line
2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c Update fournisseur.commande.class.php 2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45 Update fournisseur.commande.class.php 2018-04-27 12:18:45 +02:00
Laurent Destailleur
4c87cbf644 Update card.php 2018-04-27 12:14:51 +02:00
Laurent Destailleur
f1b9188e9b Merge pull request #8563 from ATM-Marc/NEW_backurlforcard
NEW: default add action: new param $backurlforcard to redirect to card
2018-04-27 11:57:15 +02:00
Laurent Destailleur
fef5a24870 Update myobject_card.php 2018-04-27 11:52:40 +02:00
Laurent Destailleur
e88c67ab11 Update actions_addupdatedelete.inc.php 2018-04-27 11:52:10 +02:00
Laurent Destailleur
9aa5633977 Merge pull request #8691 from hregis/develop_email
Fix: use "socpeople" instead "societe"
2018-04-27 11:42:27 +02:00
Laurent Destailleur
1cbf5f1c5e Merge pull request #8687 from dolibarr95/patch-43
NEW : Allow negative quantity for dispatch (supplier order)
2018-04-27 11:41:05 +02:00
Laurent Destailleur
c376cc5779 Merge pull request #8686 from grandoc/new_branch_26_04_2018
clean code
2018-04-27 11:39:32 +02:00
Laurent Destailleur
e18190565c Merge pull request #8683 from ATM-Marc/FIX_export_actioncomm
FIX: actioncomm export: type filtering not working
2018-04-27 11:38:59 +02:00
Laurent Destailleur
e3142fff39 NEW Add method to register distributed payments on invoices 2018-04-27 11:38:31 +02:00
Laurent Destailleur
ef19136ff2 Merge pull request #8692 from Dolibarr/revert-8690-revert-8682-develop
Revert "Revert "NEW : Adds a contact to an invoice with REST API""
2018-04-27 10:46:18 +02:00
Laurent Destailleur
469d909126 Revert "Revert "NEW : Adds a contact to an invoice with REST API"" 2018-04-27 10:46:09 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
0a3a3a8bcf Merge pull request #8690 from Dolibarr/revert-8682-develop
Revert "NEW : Adds a contact to an invoice with REST API"
2018-04-27 10:40:40 +02:00
Laurent Destailleur
df9f4d3193 Revert "NEW : Adds a contact to an invoice with REST API" 2018-04-27 10:40:27 +02:00
Laurent Destailleur
fb582c2444 Merge pull request #8682 from Oeris/develop
NEW : Adds a contact to an invoice with REST API
2018-04-27 10:37:04 +02:00
Laurent Destailleur
db8ddc4712 Merge pull request #8680 from ATM-Nicolas/new_paymentsocial_trigger
NEW : Call to trigger on payment social contribution creation
2018-04-27 10:32:34 +02:00
Laurent Destailleur
3af67d4b92 Merge pull request #8679 from ATM-Nicolas/fix_wrong_trigger_name
FIX : Wrong trigger name
2018-04-27 10:32:17 +02:00
Laurent Destailleur
0a4bd14bc3 Merge pull request #8678 from defrance/patch-111
add $user on delete line
2018-04-27 10:31:19 +02:00
Laurent Destailleur
c40b50ca71 Fix typo 2018-04-27 10:23:09 +02:00
Laurent Destailleur
489318d4db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-27 10:18:40 +02:00
Laurent Destailleur
aa30b946b6 Fix from #8677 2018-04-27 10:18:22 +02:00