Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 11:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,155 Commits 39 Branches 191 Tags
d032b6ecfb2df6ca63ce755445a632d65fc2baff
Commit Graph

65155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ptibogxiv
d032b6ecfb Fix error in list.php 2018-05-26 09:51:56 +02:00
Laurent Destailleur
bf81b755f9 Fix state code for payment from indonesia 2018-05-25 16:21:13 +02:00
Laurent Destailleur
37dcfe4a46 FIX button to pay still visible when amount null used 2018-05-25 16:00:23 +02:00
Laurent Destailleur
943d1dce2e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-25 13:15:38 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
1a1f0fbc62 Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch 
FIX : Fetch shipping will now fetch project id
 2018-05-25 11:46:06 +02:00
Laurent Destailleur
131ddd6984 Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project 
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
 2018-05-25 11:12:39 +02:00
Laurent Destailleur
b25c7e44d3 Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice 
FIX : test is_erasable() must be done before call function delete()
 2018-05-25 11:05:20 +02:00
Laurent Destailleur
0a581e48d4 Update card.php 2018-05-25 11:04:04 +02:00
Laurent Destailleur
04586fab66 Merge pull request #8824 from ggg44473/7.0 
Fix sql error accounting account
 2018-05-25 10:41:16 +02:00
Laurent Destailleur
545133960e Merge pull request #8849 from atm-quentin/FIX_missing_filters_during_ordering 
FIX missing filters during reordering
 2018-05-25 10:15:20 +02:00
Laurent Destailleur
3816b18c27 Merge pull request #8856 from glu000/7.0 
FIX: It's not possible to remove a contact which is assigned to an event #8852
 2018-05-25 10:14:19 +02:00
Günter Lukas
1b237a75b9 Update card.php 2018-05-24 13:31:23 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Laurent Destailleur
4967c678b8 Fix translation 2018-05-23 18:05:19 +02:00
Laurent Destailleur
3a06918b16 FIX Missing extrafields in export of stock or products 2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666 FIX Missing extrafields in export 2018-05-23 17:48:18 +02:00
ATM-Nicolas
734ecbc9b5 FIX : Fetch shipping will now fetch project id 2018-05-23 09:47:29 +02:00
Laurent Destailleur
2a579b707a FIX javascript showempty error 
FIX Contact tab not visible when using canvas
 2018-05-22 19:43:28 +02:00
Laurent Destailleur
be21405d21 Fix missing error message 2018-05-22 19:24:56 +02:00
Laurent Destailleur
7fce02e72e Fix phpunit test name 2018-05-21 23:43:26 +02:00
Laurent Destailleur
8951c4a7a5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-21 23:36:47 +02:00
Laurent Destailleur
afa57fd66d Fix syntax error 2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493 Fix PSR True->true and GETPOST file name for local checksum check 2018-05-21 22:24:27 +02:00
Laurent Destailleur
e5561ecdfb Remove useless files 2018-05-21 22:14:15 +02:00
Marc de Lima Lucio
c9222adf6d FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods 2018-05-21 16:22:06 +02:00
Sean Wang
8e397b772f Fix sql error 2018-05-21 14:19:41 +08:00
gauthier
4c3f9d6d5e FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url 2018-05-18 15:20:16 +02:00
BENKE Charlene
24d353c9a7 inversion of dateo and datee 2018-05-18 12:24:44 +02:00
Laurent Destailleur
7de812d2ed Merge pull request #8793 from atm-john/Fix_situation_discount_used 
Fix creating next situation invoice if a discount was allready apply
 2018-05-18 12:18:58 +02:00
Laurent Destailleur
b5f37b2876 Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling 
Fix product vat update error handling
 2018-05-18 12:00:03 +02:00
Laurent Destailleur
508f6c1a89 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:53:09 +02:00
Laurent Destailleur
6d0306f75a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-05-18 11:52:48 +02:00
Laurent Destailleur
5f8346f854 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:30 +02:00
Laurent Destailleur
492b1e7169 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:08 +02:00
Laurent Destailleur
75f5cdbc0f Merge pull request #8810 from simnandez/7.0 
Fix: extrafiels is not passing orders to invoice
 2018-05-18 11:47:44 +02:00
Laurent Destailleur
f2cfb928e8 Merge pull request #8809 from simnandez/5.0 
Fix: extrafiels is not passing orders to invoice
 2018-05-18 11:47:27 +02:00
Laurent Destailleur
24281028b7 Merge pull request #8807 from inoveaconseil/patch-2 
Fix missing params for commonGenerateDocument
 2018-05-18 11:43:11 +02:00
Laurent Destailleur
fa7f81c828 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-18 11:38:26 +02:00
Laurent Destailleur
a450f99e8a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-05-18 11:38:11 +02:00
Laurent Destailleur
162d271884 Merge pull request #8803 from atm-alexis/7.0_fix_task_contact_card_withoutproject 
FIX 7.0 task contact card without withproject parameters
 2018-05-18 11:29:11 +02:00
Laurent Destailleur
71f8971a8e Merge pull request #8794 from ATM-Nicolas/fix_select_user 
FIX : Select user on add time spent form
 2018-05-18 11:27:05 +02:00
Laurent Destailleur
078ea2ce9b Merge pull request #8790 from aspangaro/7.0-f1 
Fix : Double WHERE on admin/journal_list.php
 2018-05-18 11:20:05 +02:00
Laurent Destailleur
2e9f5d1c94 Merge pull request #8798 from atm-florian/6.0 
fix SQL and add hook
 2018-05-18 11:18:10 +02:00
Laurent Destailleur
79bbeb05ae Add missing phpunit tests 2018-05-18 11:17:33 +02:00
Laurent Destailleur
e2369dea29 FIX #8722 2018-05-18 11:17:21 +02:00
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
Laurent Destailleur
80bce6b62d Add phpunit for accountingaccount 2018-05-18 09:25:59 +02:00
Juanjo Menent
dd259043cd Fix: Cashdesk does not apply multi-price or price per customer 2018-05-18 09:20:18 +02:00
Laurent Destailleur
26e10caa7d FIX #8813 2018-05-18 09:15:18 +02:00