Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,666 Commits 36 Branches 190 Tags
c4c7ccc22609ae69b10ba08dd46b37e742458e45
Commit Graph

1521 Commits

Author SHA1 Message Date
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
97e396af69 Work on module website 2016-09-17 21:03:20 +02:00
Laurent Destailleur
20141ec9bc Fix default value of new table 2016-09-12 17:31:36 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
ce137e3987 Fix migration when field was added without null flag. 2016-09-10 17:58:13 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
phf
7229b572dc Default entity 1 in llx_multicurrency_rate 2016-09-08 14:59:16 +02:00
phf
7917169961 Fix miss entity column in llx_multicurrency_rate 2016-09-08 14:53:59 +02:00
florian HENRY
abda9146f1 FIX : cannot add order line (if fk column is not in user they whould be 
NULL by defaut.
 2016-09-07 11:32:45 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
91ede48390 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
Laurent Destailleur
f04a3bf0c8 Fix sql error 2016-08-31 18:46:47 +02:00
Laurent Destailleur
3edb04c5b8 Fix missing migration to create entity 2016-08-31 12:54:44 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +02:00
Laurent Destailleur
867525cc91 Fix missing migration instructions 2016-08-29 17:50:31 +02:00
Laurent Destailleur
c49c23df3d Fix debug project categories 2016-08-29 17:30:54 +02:00
Laurent Destailleur
b8201c9f86 Fix fk_soc can be null because we can set notification for users only. 2016-08-28 23:46:12 +02:00
Laurent Destailleur
2e7e5151b7 Merge pull request #5463 from hregis/develop_origin 
New: Add entity field in llx_societe_remise_except and llx_societe_remise
 2016-08-28 12:23:04 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
 2016-08-25 10:15:26 +02:00
BENKE Charlie
777b9fe4d8 Update 4.0.0-5.0.0.sql 2016-08-23 11:28:10 +02:00
Laurent Destailleur
15a40f6401 Fix default value of entity 2016-08-11 15:50:18 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
f1ee2bdddf Remove deprecated field 2016-08-09 13:10:34 +02:00
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
e0c232548e Fix theme crazy after migration 2016-08-01 10:55:41 +02:00
Laurent Destailleur
246321cd8f Fix clean orphelins of leave request logs in repair tools 
Fix date of supplier proposal missing.
 2016-07-30 18:08:07 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Laurent Destailleur
9c89bc4095 Remove deprecated tables and code 2016-07-23 10:57:27 +02:00
Laurent Destailleur
b90ed8d677 Merge pull request #5375 from frederic34/charges 
NEW select bank and payment mode for social contrib
 2016-07-20 19:00:10 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
00d80d827f To match new standard, next version will be called 5.0, 6.0, ... 2016-07-15 11:17:33 +02:00
Laurent Destailleur
f758f3466e Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card 
NEW : select default bank account on thirdparty card
 2016-07-15 11:16:17 +02:00
frederic34
2de3d4ec7b Merge remote branch 'upstream/develop' into charges 
Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-07-15 10:41:56 +02:00
Laurent Destailleur
74f28b3861 NEW Complete table llx_ecm_files with field generated_or_uploaded 2016-07-15 10:38:13 +02:00
Laurent Destailleur
eb47ec5823 Drop another deprecated table llx_ecm_documents (replace by 
llx_ecm_files)
 2016-07-15 10:27:20 +02:00
Laurent Destailleur
09306ba974 Drop not used table llx_document_generator (list of generators must be 
managed by submodules like are the templates of document or engines to
select emailing targets (scan of a dedicated dir)
 2016-07-15 10:23:36 +02:00
frederic34
7e3978c403 sql changes 2016-07-15 10:04:04 +02:00
Laurent Destailleur
ec6640af63 Add field virtualhost for website module 2016-07-14 15:54:46 +02:00
Laurent Destailleur
a258663175 Fix edition of status were loosing old percent. We show it to allow user 
to keep it if required.
 2016-07-09 14:58:51 +02:00
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +02:00
Regis Houssin
08725003b9 Fix: add entity field in llx_societe_remise, useful when third-sharing 
is used with multicompany
 2016-07-07 12:43:02 +02:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when 
third-sharing is used with multicompany
 2016-07-07 12:26:30 +02:00
Sof
9b5bcc6dcd FIX: Missing semicolon 2016-07-07 10:25:17 +02:00
Regis Houssin
25631b236b Fix: missing rename field "shortname" to "ref" 2016-06-23 16:47:21 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Raphaël Doursenaud
eb54c3f8af Fix #5350 date_pointoftax prevented creating invoices 2016-06-16 13:09:11 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00