lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,790 Commits 43 Branches 150 Tags 886 MiB
4e16f64af0
Commit Graph

53631 Commits

Author SHA1 Message Date
Laurent Destailleur
be21405d21 Fix missing error message 2018-05-22 19:24:56 +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
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
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
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
John
3dd11e1eaf Fix discount id 2018-05-18 11:02:04 +02:00
Juanjo Menent
dd259043cd Fix: Cashdesk does not apply multi-price or price per customer 2018-05-18 09:20:18 +02:00
Juanjo Menent
dc7a1610e7 Fix: extrafiels is not passing orders to invoice 2018-05-17 18:56:01 +02:00
florian HENRY
630e38072b fix SQL and add hook 2018-05-15 17:02:54 +02:00
John
b42c87256c Fix_situation_discount_used 2018-05-14 14:55:33 +02:00
Laurent Destailleur
842c6168a2 FIX #8762 2018-05-10 11:50:35 +02:00
Laurent Destailleur
20c50e809d Start 6.0.8 2018-05-06 10:43:40 +02:00
Laurent Destailleur
8b4b786969
Merge pull request #8730 from atm-arnaud/FIX_project_list_label 
FIX label in getnomurl projectlist
 2018-05-05 13:26:11 +02:00
Laurent Destailleur
2f79a12c6b
Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter 
fix project and task visibility same as list
 2018-05-05 13:13:25 +02:00
Laurent Destailleur
8d52c4f919
Merge pull request #8721 from atm-florian/6.0_fixtaskid 
fix taskid
 2018-05-05 13:13:04 +02:00
Laurent Destailleur
7bb9615cff
Merge pull request #8702 from atm-florian/6.0 
fix accountancy multientity
 2018-05-05 12:53:36 +02:00
atm-arnaud
6245f25deb FIX label in getnomurl projectlist 2018-05-03 11:47:31 +02:00
florian HENRY
46e94af594 fix taskid 2018-05-02 19:46:04 +02:00
florian HENRY
3657857d21 fix project and task visibility same as list 2018-05-02 19:29:18 +02:00
atm-greg
942e2f40bf addline manage rank on its own if not provided 2018-05-02 17:07:27 +02:00
florian HENRY
886ad9d4b6 check eldy message 2018-05-02 08:45:18 +02:00
florian HENRY
b5d7206519 fix 6.0 accountancy multientity 2018-05-01 12:02:33 +02:00
Laurent Destailleur
d975dd507b
Revert "No display object line curreny if not necessary" 2018-05-01 11:17:47 +02:00
Laurent Destailleur
b1f1ddc6d0
Merge pull request #8354 from tuxgasy/5.0_multicurrency_objectline_print 
No display object line curreny if not necessary
 2018-05-01 11:15:31 +02:00
Laurent Destailleur
ab85fa8721 Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking 
situation.
 2018-04-30 17:45:34 +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
Marc de Lima Lucio
c044d9ab58 FIX: actioncomm export: type filtering not working 2018-04-25 16:20:09 +02:00
florian HENRY
882863ab48 fix : define in conf dir_output for suipplier_proposal modules 2018-04-18 16:21:20 +02:00
florian HENRY
bf27ca1b11 fix : use template at the goos place for generate doc for supplier 
propoal
 2018-04-18 16:00:37 +02:00
Laurent Destailleur
e4635c9401 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:40 +02:00
Laurent Destailleur
c7789d2038 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:06 +02:00
Laurent Destailleur
11897976c3
Merge pull request #8625 from hregis/6.0_multicompany 
Fix: missing drop index with postgresql
 2018-04-17 18:52:45 +02:00
Regis Houssin
9a210c1a91 Fix: syntax error for postgresql > 9.1 2018-04-17 17:33:40 +02:00
Regis Houssin
dd835c4868 Fix: missing drop index with postgresql 2018-04-17 17:18:59 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
64dafbc37f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Juanjo Menent
bfed1b9db1 FIX: some localtaxes errors 2018-04-14 12:45:40 +02:00
Regis Houssin
79c34f4d69 Fix: project category is type 6 not 5 !! 2018-04-14 10:03:21 +02:00
Laurent Destailleur
50a3b73a6f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:18 +02:00
atm-greg
4fae1e3236 rank of invoice_supplier lines was always -1 2018-04-13 17:01:10 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
atm-greg
ef2c6a0ed4 fix sql error 2018-04-13 10:31:36 +02:00
atm-greg
58535993c1 use special_code on order_supplier lines 2018-04-13 10:31:27 +02:00
florian HENRY
cd2f6616be fix index creation with unique name for pgSQL 2018-04-12 16:41:53 +02:00
florian HENRY
def28be0ab fix error on first install pgsql 2018-04-12 16:36:04 +02:00
Laurent Destailleur
eec99b436e
Merge pull request #8565 from atm-greg/Add_supplierContactName_on_documents 
Add supplier contact name on supplier documents
 2018-04-11 19:25:01 +02:00
Laurent Destailleur
0f3d2cc8df
Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice 
Fix wrong amount for situation invoice in sellsjournal
 2018-04-11 17:51:00 +02:00
atm-greg
ae34fa6fbd add supplier contact name on supplier documents 2018-04-11 17:42:26 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity 
Fix extrafield entity query filter
 2018-04-11 17:31:36 +02:00
Laurent Destailleur
9fafefa0d7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 17:18:09 +02:00
Laurent Destailleur
0518218aed Fix regression 2018-04-11 17:17:03 +02:00
atm-ph
6f526eb780 Fix wrong amount for situation invoice in sellsjournal 2018-04-11 16:40:59 +02:00
Laurent Destailleur
b732844e91
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag 
FIX #8023
 2018-04-11 16:25:33 +02:00
Laurent Destailleur
628b437e28
Update card.php 2018-04-11 16:25:05 +02:00
Laurent Destailleur
c392b9b8ef
Merge pull request #8541 from atm-gauthier/FIX_count_6.0 
FIX #8478 !empty instead of count to avoid warning
 2018-04-11 14:55:41 +02:00
Laurent Destailleur
75bc3d17e6
Update admin_extrafields_view.tpl.php 2018-04-11 14:55:29 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement 
FIX: payment term doc-specific label was not used (issue #8414)
 2018-04-11 14:52:06 +02:00
Laurent Destailleur
804703c9c9 Fix regression 2018-04-11 14:43:16 +02:00
Laurent Destailleur
e1c83df086 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 14:39:13 +02:00
Laurent Destailleur
560038fa18 Fix regression in update contact 2018-04-11 14:38:56 +02:00
Laurent Destailleur
c2eb2bf10e
Merge pull request #8542 from ATM-Marc/FIX_user_autocomplete 
FIX: weird password autocompletion in Google Chrome (issue #8479)
 2018-04-11 13:22:42 +02:00
Laurent Destailleur
edb59c05dc
Merge pull request #8525 from atm-greg/Add_projettaskcard_hook 
add doActions hook on projettaskcard
 2018-04-11 13:20:07 +02:00
Laurent Destailleur
e642535389
Merge pull request #8561 from frederic34/patch-11 
Update combinations.php
 2018-04-11 13:09:34 +02:00
Laurent Destailleur
6731e238a3
Merge pull request #8550 from atm-quentin/FIX_Issue_8037 
FIX issue #8037
 2018-04-11 13:06:26 +02:00
Laurent Destailleur
7d7c0624d2
Update traduction.php 2018-04-11 12:59:24 +02:00
Frédéric FRANCE
a95bc76afb
Update combinations.php 2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383
Update getCombinations.php 2018-04-11 12:05:23 +02:00
Frédéric FRANCE
2c76a6cd80
Update combinations.php 2018-04-11 11:44:22 +02:00
John
96e26100f0 Add extrafield entity query filter 2018-04-11 11:27:47 +02:00
atm-greg
7cdc1c8bef Fix #8259 can't update contact birthday with REST API 2018-04-11 07:08:40 +02:00
atm-quentin
809b2a91ed FIX issue #8037 2018-04-10 16:27:18 +02:00
Marc de Lima Lucio
1fd5dba118 FIX: payment term doc-specific label was not used 2018-04-10 15:24:57 +02:00
Marc de Lima Lucio
307ede8b22 FIX: weird password autocompletion in Goocle Chrome (issue #8479) 2018-04-10 15:03:50 +02:00
gauthier
5621d1f8ea FIX #8478 !empty instead of count to avoid warning 2018-04-10 15:03:15 +02:00
atm-arnaud
848d76ee78 FIX #8023 2018-04-10 14:43:32 +02:00
atm-greg
b1469ba761 add doActions hook on projettaskcard 2018-04-09 07:06:20 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php 2018-03-29 13:48:09 +02:00
atm-ph
a89983ef5c Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code 2018-03-28 15:41:10 +02:00
florian HENRY
11446fb2f7 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-03-22 23:26:37 +01:00
florian HENRY
46d2b4d62d fix security check on fourn card 2018-03-22 23:25:54 +01:00
Laurent Destailleur
9f67bb0aa3 Start 6.0.7 2018-03-22 21:58:24 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
atm-ph
2094c48b7f Fix missing folder with multientity 2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b Fix documents are lost if we rename contrat ref 2018-03-21 11:54:25 +01:00
Laurent Destailleur
04199c2b4b Fix according to mail of Olivier Geffroy the 21th of march 2018-03-21 10:59:13 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
ATM-Nicolas
e801b5a431 FIX : Delete tasks on project delete will now trigger TASK_DELETE 2018-03-14 11:38:42 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php 2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +01:00