Commit Graph

3377 Commits

Author SHA1 Message Date
Anthony Berton
d3fa8b9f20 20210110 2021-01-10 01:07:27 +01:00
Laurent Destailleur
0448bf07cb Fix field size 2021-01-08 00:52:26 +01:00
Laurent Destailleur
53da17e051 Add column to count pageview on website module 2021-01-08 00:49:58 +01:00
lmarcouiller
d88adb3d47 move line 553 of 12 to 13 migration to 13 to 14 2021-01-05 18:10:57 +01:00
lmarcouiller
6aa2241617 Merge remote-tracking branch 'doligithub/develop' into develop#2 2021-01-05 18:07:34 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
ptibogxiv
9be1ce7d20 NEW better date_valid on invoice
need hour minutes and secondes for better order and search
2021-01-03 20:25:35 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Laurent Destailleur
7f0f72ca47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Frédéric FRANCE
8ad9c3dbe9 fix migration for icstransfert 2021-01-02 09:07:16 +01:00
Laurent Destailleur
3cb71ef53e Code comment 2021-01-01 22:55:22 +01:00
Laurent Destailleur
b88ee6eff4 Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5 Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Laurent Destailleur
30d2c8fb56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-27 15:19:07 +01:00
Laurent Destailleur
f8b179a1be Merge pull request #15351 from frederic34/patch-13
separate ref and rowid in members
2020-12-27 15:18:55 +01:00
Laurent Destailleur
e4d7ce371e Add file for #15351 2020-12-27 15:16:21 +01:00
Laurent Destailleur
4c9a597c8a Update 12.0.0-13.0.0.sql 2020-12-27 15:13:20 +01:00
Laurent Destailleur
1546805b9e Merge pull request #15500 from frederic34/patch-10
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
5ae5f3e7ac let societe project acctioncomme website accounr 2020-12-24 00:32:54 +01:00
Laurent Destailleur
0195c11437 Add missing field required for real funnel of prospection. 2020-12-21 12:58:03 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
812fd22629 Merge branch 'develop' into develop#2 2020-12-15 14:09:29 +01:00
Alexandre SPANGARO
593f5bcb7a Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-15 06:50:22 +01:00
Frédéric FRANCE
1b75ac9ffe add github 2020-12-12 21:17:18 +01:00
Laurent Destailleur
bfa8383bed Fix migration script 2020-12-12 12:30:13 +01:00
Laurent Destailleur
33bb1919f0 Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
4fa1248d15 Fix avoid duplicate rows after double migration 2020-12-11 16:53:03 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/card.php
2020-12-08 22:27:27 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Alexandre SPANGARO
78dc1eaa83 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-08 13:51:01 +01:00
Hystepik
3d674abfae Merge branch 'develop' into develop#2 2020-12-08 09:01:20 +01:00
Hystepik
2ac98d06f5 Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Frédéric FRANCE
a2eab824c1 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Frédéric FRANCE
914d2ae7f7 Merge remote-tracking branch 'upstream/develop' into patch-13 2020-12-04 20:40:35 +01:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +01:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
Laurent Destailleur
8a7f7b3551 FIX Request on purchase orders in timeout even on very small databases 2020-12-03 18:38:18 +01:00
Laurent Destailleur
210ccc4b43 FIX Missing very important performance indexes 2020-12-03 18:34:32 +01:00
Hystepik
4830f4a3b4 Merge branch 'develop' into develop#2 2020-12-03 11:05:00 +01:00
lmarcouiller
647294e88e fix #15384 migration 2020-12-03 11:04:24 +01:00
lmarcouiller
e08f6aeb2b Fix #15383 2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce Merge branch 'develop' into develop#3 2020-12-03 10:39:25 +01:00