lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,550 Commits 43 Branches 150 Tags 886 MiB
88ad997eec
Commit Graph

5046 Commits

Author SHA1 Message Date
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255 2019-10-08 19:37:42 +02:00
ptibogxiv
17198d59c2
Update 10.0.0-11.0.0.sql 2019-10-08 16:17:31 +02:00
ptibogxiv
552a9498be
Update llx_product.sql 2019-10-08 16:11:50 +02:00
Laurent Destailleur
d55b7689bb
Merge pull request #11920 from ptibogxiv/patch-264 
NEW translation for member type
 2019-10-08 09:00:49 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
e02794248e
Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
edf559697a
restore unfinished old commit 2019-10-01 23:47:45 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
956b46d920 Fix warnings 2019-10-01 11:37:15 +02:00
Frédéric FRANCE
6a7170f725
Merge remote-tracking branch 'upstream/develop' into phpcalendar 2019-10-01 07:55:09 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
91b7e81085 Fix warnings 2019-09-30 21:51:42 +02:00
Frédéric FRANCE
31418c2e42
check php-calendar extension 2019-09-30 21:14:25 +02:00
Laurent Destailleur
3ca1a9ba28 Merge branch 'test_pgsql_installation' of https://github.com/atm-greg/dolibarr into atm-greg-test_pgsql_installation 2019-09-30 19:59:52 +02:00
Laurent Destailleur
22f07fe54d
Merge branch 'develop' into patch-234 2019-09-30 18:09:05 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
ptibogxiv
f132f2f947
Update 10.0.0-11.0.0.sql 2019-09-29 15:40:26 +02:00
ptibogxiv
d0b06a1eab
Update llx_facture.sql 2019-09-29 15:39:59 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop 
Fix: Load invoices only if showed
 2019-09-27 14:34:16 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Frédéric FRANCE
5eb0fb462b
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-27 07:59:02 +02:00
Laurent Destailleur
72f9073337 Clean vat code samples to have cleaner rules for rowid. 2019-09-26 12:44:44 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Ferran Marcet
a8cc11d232 Merge branch 'developup' into develop 2019-09-24 13:38:11 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
64fc735340 Fix length of fields to card saved with setupintent 2019-09-23 18:12:58 +02:00
Laurent Destailleur
1584a4bf79 Add trigger event USER_SENTBYMAIL in agenda 2019-09-23 12:27:51 +02:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-18 21:23:26 +02:00
Laurent Destailleur
a43253eab8 Fix for deposit not correctly closed 2019-09-17 18:49:56 +02:00
ptibogxiv
b969de46bc
Update 10.0.0-11.0.0.sql 2019-09-17 14:05:39 +02:00
ptibogxiv
4c59f6bffa
Update llx_adherent_type_lang.sql 2019-09-17 14:03:55 +02:00
ptibogxiv
430ffae8ad
Delete llx_adherent_type_lang.php 2019-09-17 14:03:22 +02:00
ptibogxiv
afb055c8a6
Create llx_adherent_type_lang.sql 2019-09-17 14:03:09 +02:00
ptibogxiv
50be1a634c
Create llx_adherent_type_lang.php 2019-09-17 14:02:19 +02:00
Ferran Marcet
e4984492b3 Dejarlo igual que develop 2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf Merge branch 'developup' into develop 
# Conflicts:
#	htdocs/compta/facture/fiche-rec.php
#	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
 2019-09-17 09:27:42 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Maxime Kohlhaas
48cbcdc757
Fix #11876 2019-09-15 17:08:21 +02:00
Frédéric FRANCE
1e652a41af
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 18:41:51 +02:00
Laurent Destailleur
54f0532073 Work on #4432 2019-09-14 16:51:57 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
eeaeefe20c FIX Add repair.php option 'restore' to restore user picture after v10 2019-09-11 15:46:37 +02:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187 2019-09-10 20:46:54 +02:00
florian HENRY
d081a73dca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-10 08:36:54 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
florian HENRY
617e430998 fix stravis and sticker 2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
Laurent Destailleur
47f72fb74c Update data file 2019-09-08 21:21:58 +02:00
Frédéric FRANCE
4054ebaf27
wip 2019-09-07 15:12:07 +02:00
Laurent Destailleur
bdbae9b3bc Fix phpcs 2019-09-06 23:51:33 +02:00
Laurent Destailleur
ca71f02d41
Merge branch 'develop' into develop_pdf 2019-09-06 23:30:12 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
e1ee70fd8f Start to implement date selection of supplier proposals 2019-09-06 12:45:27 +02:00
ptibogxiv
ead8d29ed3
Update 10.0.0-11.0.0.sql 2019-09-06 11:32:46 +02:00
ptibogxiv
e55c7bc378
Update llx_facture.sql 2019-09-06 11:22:22 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Regis Houssin
ecaa2df0b8 FIX change "rowid" type in llx_accounting_account (bigint instead int) 2019-09-05 10:37:09 +02:00
Laurent Destailleur
7aaf3ac629 Typo 2019-09-04 15:41:09 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
florian HENRY
73c5b9617f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-03 17:07:59 +02:00
Laurent Destailleur
c4a4efe0dc
Merge pull request #11769 from Tim-Otte/develop 
NEW: Added odt support to supplier orders
 2019-09-03 13:04:33 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9 start dev 2019-09-02 11:27:04 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
8366d89b41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/10.0.0-11.0.0.sql
 2019-08-28 18:15:22 +02:00
Laurent Destailleur
d668b79738 NEW Add column tms into the table of targets for emailing 2019-08-28 18:14:46 +02:00
Laurent Destailleur
27b61eca32 NEW Add column tms into the table of targets for emailing 2019-08-28 18:12:02 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
c2c9e1d042 Fix warning 2019-08-27 12:15:29 +02:00
Laurent Destailleur
047298cded
Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug 
9.0 fix dispatched products array bug
 2019-08-26 23:58:40 +02:00
Laurent Destailleur
1463302bdd Add option to disable the anonymous ping 2019-08-23 16:23:31 +02:00
Laurent Destailleur
bc269462a7 FIX Do not autocomplete pass on first installation. 2019-08-23 15:30:48 +02:00
ptibogxiv
01f0a6a19f
Update llx_adherent_type.sql 2019-08-23 14:56:59 +02:00
ptibogxiv
b8fce830f7
Update llx_adherent_type.sql 2019-08-23 14:56:38 +02:00
ptibogxiv
60a7ba463c
Update 10.0.0-11.0.0.sql 2019-08-23 14:53:40 +02:00
Florian Mortgat
fa29415e6a Moved repair payload from a specific script to install/repair.php 2019-08-22 14:06:18 +02:00
ptibogxiv
e43d996780
Update 10.0.0-11.0.0.sql 2019-08-21 16:45:53 +02:00
ptibogxiv
869e497a48
NEW : Platforme compliance with Stripe Connect 2019-08-21 16:41:36 +02:00
Laurent Destailleur
23b1c24bf7 Fix template 2019-08-16 06:28:25 +02:00
Laurent Destailleur
5d1bfdaa29
Merge pull request #11678 from atm-greg/develop_fk_projet_on_stock_movement 
NEW Add fk projet on stock movement
 2019-08-15 19:27:06 +02:00