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

53594 Commits

Author SHA1 Message Date
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
TuxGasy
34145ed443 Do not display multicurrency cols if currency of object is same as main currency 2018-03-11 21:58:32 +01:00
Laurent Destailleur
95e7062ca3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Laurent Destailleur
f98ca2e31a
Merge pull request #8335 from inoveaconseil/patch-1 
Fix #8092
 2018-03-11 00:06:28 +01:00
Laurent Destailleur
03f7df88c6
Update card.php 2018-03-11 00:05:32 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
atm-ph
53ce297ab3 Fix travis - missing documentation of new param 2018-03-09 09:30:11 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00
ATM-Nicolas
60f8ca1283 Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_order_line_fk_multicurrency 2018-03-05 09:03:20 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
ee4fcba4f2 Fix class not found 2018-02-27 22:11:11 +01:00
gauthier
4d05bff780 FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back 2018-02-27 12:27:25 +01:00
ATM-Nicolas
27100df927 FIX : Avoid empty value to fk_multicurrency attribute 2018-02-27 11:06:11 +01:00
Laurent Destailleur
64dd6439e7
Merge pull request #8223 from atm-florian/6.0 
fix bad link invoice URL into acoutantcy customer affectation
 2018-02-25 12:42:03 +01:00
Laurent Destailleur
286d62edb8
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns 
FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
 2018-02-25 12:35:05 +01:00
Laurent Destailleur
c698558d9e
Merge pull request #8212 from simnandez/6.0 
Fix: Not showing link to ad event if module is disabled
 2018-02-25 12:28:06 +01:00
Laurent Destailleur
b20ae45265
Merge pull request #8210 from atm-john/fix_sql_entity 
Fix sql entity for sub query
 2018-02-25 12:27:35 +01:00
Laurent Destailleur
2d252e85e6 FIX Import process must stop after ending line nb to import 2018-02-25 12:15:36 +01:00
atm-ph
d300b943e1 Fix wrong price on supplier order line 2018-02-23 15:10:25 +01:00
florian HENRY
b4b185abe0 fix bad link invoice URL into acoutantcy customer affectation 2018-02-23 14:42:52 +01:00
Marc de Lima Lucio
36cc1c6ca9 FIX: solve column mismatch in user card's usergroup list + code cleanup 2018-02-23 11:59:22 +01:00
Juanjo Menent
1d6baf5f2b Fix: Not showing link to ad event if module is disabled 2018-02-22 10:16:53 +01:00
John
b276a8186e Fix sql entity for sub query 2018-02-21 10:03:04 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill 
fix the bill replacement with discounts #8028
 2018-02-20 15:19:19 +01:00
Laurent Destailleur
01c2971f4f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 15:08:17 +01:00
Laurent Destailleur
9690e68bfb
Merge pull request #8206 from fmarcet/5.0 
Fix: Barcode type on massive init
 2018-02-20 15:07:53 +01:00
Laurent Destailleur
b8736f5103 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
Laurent Destailleur
6c8e7494f0
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip 
Fix contact tooltip
 2018-02-20 14:56:06 +01:00