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 |
|
Laurent Destailleur
|
8f60bd35a5
|
Merge pull request #8676 from atm-florian/7.0
fix commonobject double style
|
2018-04-27 10:14:13 +02:00 |
|
Laurent Destailleur
|
27997b8c11
|
Merge pull request #8675 from ATM-Nicolas/fix_link_credit_note
Fix link credit note
|
2018-04-27 10:12:31 +02:00 |
|
Laurent Destailleur
|
19d15c79dd
|
Merge pull request #8673 from frederic34/variantonservice
NEW Module variant supported on services
|
2018-04-27 10:01:28 +02:00 |
|
Laurent Destailleur
|
3faeb08b78
|
Merge pull request #8672 from ATM-Nicolas/fix_action_contact
FIX : Related contact printed in societe agenda
|
2018-04-27 10:00:18 +02:00 |
|
Laurent Destailleur
|
1d40d34123
|
Merge pull request #8669 from tomours/develop
Fix french bank holidays (Easter related)
|
2018-04-27 09:56:01 +02:00 |
|
Laurent Destailleur
|
42722da824
|
Update date.lib.php
|
2018-04-27 09:55:44 +02:00 |
|
Laurent Destailleur
|
dde86628e7
|
Update date.lib.php
|
2018-04-27 09:49:52 +02:00 |
|
Laurent Destailleur
|
e1cfe0e2dd
|
Update date.lib.php
|
2018-04-27 09:49:15 +02:00 |
|
Laurent Destailleur
|
2ecbd132aa
|
Merge pull request #8668 from tuxgasy/Add_Hook_ordersupplierdispatch
New ordersupplierdispatch hook
|
2018-04-27 09:47:22 +02:00 |
|
Laurent Destailleur
|
cee4df9b27
|
Merge pull request #8667 from grandoc/new_branch_23_04_2018
clean code
|
2018-04-27 09:46:55 +02:00 |
|
Laurent Destailleur
|
e2b936e2d8
|
Merge pull request #8666 from frederic34/patch-2
Update api_products.class.php
|
2018-04-27 09:45:40 +02:00 |
|
Laurent Destailleur
|
3301c99b75
|
Merge pull request #8664 from DazzX/turnover_stat
Fix Year selector issue in turnover statistics page
|
2018-04-27 09:40:50 +02:00 |
|
Laurent Destailleur
|
659fd46b76
|
Merge pull request #8653 from ATM-Marc/NEW_commonObject_array
NEW: work on CommonObject 'array' field typeNew common object array
|
2018-04-27 09:39:26 +02:00 |
|
Laurent Destailleur
|
59e5545aa7
|
Fix phpunit
|
2018-04-27 09:18:25 +02:00 |
|
dolibarr95
|
1fb6f79727
|
Update dispatch.php
Only without batch module enabled
|
2018-04-27 09:14:52 +02:00 |
|
Laurent Destailleur
|
69db960a92
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/activity/perweek.php
|
2018-04-26 18:33:02 +02:00 |
|
Laurent Destailleur
|
46a8511c69
|
Look and feel v8 (delete button in end of list)
|
2018-04-26 18:25:57 +02:00 |
|
Laurent Destailleur
|
761d2b3667
|
FIX Not approved holidays must not be visible into timesheet
|
2018-04-26 17:44:36 +02:00 |
|
dolibarr95
|
14e68ea8f9
|
Allow qty to be negative
|
2018-04-26 16:42:08 +02:00 |
|
Philippe GRAND
|
966419254d
|
clean code
|
2018-04-26 15:44:15 +02:00 |
|