Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,299 Commits 35 Branches 179 Tags 1.7 GiB
e351657cc0
Commit Graph

36370 Commits

Author SHA1 Message Date
Marcos García de La Fuente
e351657cc0 Removed key restrictions 2014-07-03 10:16:37 +02:00
Marcos García de La Fuente
d38bebf990 Created foreign key relations for llx_product and llx_product_price table 2014-07-02 21:04:34 +02:00
Laurent Destailleur
b985dc3342 Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/install/mysql/tables/llx_bank_account.sql
 2014-06-30 00:42:17 +02:00
Laurent Destailleur
ebc6bede13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-29 23:59:10 +02:00
Laurent Destailleur
6cf8c3d08c Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-06-29 23:57:57 +02:00
Laurent Destailleur
d8b9cdf5c2 Merge pull request #1692 from atm-maxime/develop 
New : remaining to shipon delivery PDF
 2014-06-29 23:45:38 +02:00
Laurent Destailleur
e2472351c3 Merge branch 'fix1487' of github.com:KreizIT/dolibarr into 
KreizIT-fix1487

Conflicts:
	ChangeLog
 2014-06-29 23:42:38 +02:00
Laurent Destailleur
31c27b8f7c New: More option to define default filter setting of agenda views. 2014-06-29 23:35:00 +02:00
aspangaro
5cc8ec4f5f Add accountancy code journal into bank card & modify presentation 2014-06-29 20:10:43 +02:00
Laurent Destailleur
5c9edcd6a3 Fix: No double title on margin tabs 2014-06-29 14:04:51 +02:00
Laurent Destailleur
bb2e843fc9 More visible information on predefined invoices. 2014-06-29 14:03:14 +02:00
aspangaro
53bd5022e0 Align size for accounting account & Drop old table & Typo 2014-06-29 07:57:42 +02:00
Laurent Destailleur
faeeca533b Fix: sql error 2014-06-29 04:34:12 +02:00
Laurent Destailleur
6f0250cb94 Fix: typo 2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9 New: Add hook "searchAgendaFrom". 2014-06-29 02:45:55 +02:00
Laurent Destailleur
a96655c363 Translation of juridical status for de_CH 2014-06-29 01:13:44 +02:00
Laurent Destailleur
65febb6e7b Translation of juridical status for de_CH 2014-06-29 01:04:45 +02:00
Maxime Kohlhaas
7d16f62a9d New : add remaining to ship on delivery PDF 2014-06-28 22:48:20 +02:00
Laurent Destailleur
56bc99a558 Include iso code for countries 2014-06-28 21:40:10 +02:00
Laurent Destailleur
567280e85d Fix: Too much br 2014-06-28 21:17:27 +02:00
Laurent Destailleur
6916d251b5 New: Can filter events on a group of users. 2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3 New: Can create proposal from an intervention. 2014-06-28 19:47:51 +02:00
Laurent Destailleur
0e36295e12 Add option FICHINTER_DISABLE_DETAILS 2014-06-28 18:43:36 +02:00
Laurent Destailleur
a8e4391887 Prepare calendars to be able to show calendars with selection on several 
users.
 2014-06-28 18:04:32 +02:00
Maxime Kohlhaas
b7ee10a074 New : can add all products in a shipment, even if qty is 0 with SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2014-06-28 17:17:37 +02:00
Laurent Destailleur
2c493a4fe3 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750 Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to 
sender.
 2014-06-28 14:48:00 +02:00
Laurent Destailleur
7d72b6c3a1 Add comments 2014-06-28 14:06:29 +02:00
Laurent Destailleur
d903db6a18 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-06-28 01:54:20 +02:00
Laurent Destailleur
18838ccfa0 Fix: Correct name for thirdparty created from member. 2014-06-28 01:53:56 +02:00
Laurent Destailleur
442e15e94e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-27 20:51:03 +02:00
Laurent Destailleur
e5a06635dc Fix css for agenda box 
Make different view of agenda into different tabs.
 2014-06-27 20:50:46 +02:00
KreizIT
a153480bc6 Fix : [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action 
Change trigger call to new function call_trigger
 2014-06-27 13:48:23 +02:00
Juanjo Menent
773caf808e [ task #867 ] Remove ESAEB external module code from core 2014-06-27 09:09:54 +02:00
Juanjo Menent
6ce1ef08cf [ task #867 ] Remove ESAEB external module code from core 2014-06-27 09:09:08 +02:00
Laurent Destailleur
96da5bf0e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-27 01:37:32 +02:00
Laurent Destailleur
4cd3a4f4aa Fix: bad indice 2014-06-27 01:34:27 +02:00
Laurent Destailleur
51270ab28a Merge pull request #1614 from guerinaxel/patch-5 
Add extrafields to productorservice webservice
 2014-06-26 23:05:31 +02:00
Laurent Destailleur
29dfb71bbd Merge branch 'patch-11' of github.com:defrance69/dolibarr into 
defrance69-patch-11

Conflicts:
	htdocs/core/class/commonobject.class.php
 2014-06-26 23:04:26 +02:00
Laurent Destailleur
092d1b725d Merge pull request #1684 from KreizIT/triggers 
FIX #1460, #1461
 2014-06-26 22:59:55 +02:00
Laurent Destailleur
d5e0bcfaee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-06-26 22:54:36 +02:00
Laurent Destailleur
1dafb58f09 Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into 
aspangaro-develop-accounting3

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2014-06-26 22:53:25 +02:00
BENKE Charles
8acd702cd1 Using hidden constant to use the feature 
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
 2014-06-26 22:34:40 +02:00
Laurent Destailleur
f25bb79d80 Merge pull request #1672 from defrance69/patch-19 
Add project and task boxes
 2014-06-26 22:03:38 +02:00
Laurent Destailleur
534e574379 Merge pull request #1668 from aspangaro/develop-dons 
Move donation receipt to french model cerfa 11580*03
 2014-06-26 22:03:13 +02:00
Laurent Destailleur
656dd94011 Merge pull request #1657 from mkdgs/patch-1 
Add customers/supplier status fo contact export
 2014-06-26 21:58:23 +02:00
Laurent Destailleur
722847cbe6 Add option to enable keypad (in most cases, we don't need this). 2014-06-26 21:57:49 +02:00
Laurent Destailleur
e2790895ad Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
Laurent Destailleur
b1f858a461 Merge pull request #1644 from defrance69/patch-18 
Patch 18
 2014-06-26 21:45:10 +02:00