Laurent Destailleur
e7992131ec
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
2020-10-15 20:38:32 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
Laurent Destailleur
0dcd85485a
Fix migration
2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c
Fix migration
2020-09-25 12:22:24 +02:00
Laurent Destailleur
80ec1ad69f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-09-23 19:29:07 +02:00
atm-lena
0fc6e9b84f
FIX - Backtick not work with postgresql
2020-09-23 10:54:49 +02:00
Laurent Destailleur
c4ef21a8f2
Increase timeout delay for install
2020-09-21 14:04:46 +02:00
Laurent Destailleur
05a2fc6186
Fix rate for tunisia
2020-09-10 19:40:03 +02:00
Laurent Destailleur
c6bdd27d4c
FIX #14530
2020-08-27 21:52:25 +02:00
Laurent Destailleur
ecfdb4bbac
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-08-02 16:02:09 +02:00
Laurent Destailleur
44cfb77622
FIX #14292
2020-07-29 12:43:53 +02:00
Laurent Destailleur
4e4f0a4575
Use same case for all sql files
2020-07-28 09:44:48 +02:00
Laurent Destailleur
431b207dab
Fix to solve sql error on some databases
2020-07-24 01:02:07 +02:00
ATM john
921e904acc
Fix MySQL rank usage for column
2020-07-23 20:34:11 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0
...
Update Mexico City name
2020-07-19 02:01:12 +02:00
Laurent Destailleur
48adeb9dd7
FIX #14256
2020-07-19 01:38:38 +02:00
Alfredo Altamirano
6aae68bb07
Change Mexico City name
...
Mexico City official name and code changed since 2016
2020-07-11 10:49:05 -05:00
Laurent Destailleur
eede2f9944
Add telangana province for india
2020-07-11 10:39:12 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
5afd518718
Update vat rate for Congo
2020-06-30 13:06:44 +02:00
Laurent Destailleur
600a24346a
Some people are missing this table
2020-06-28 22:09:17 +02:00
Laurent Destailleur
2de1433818
FIX #14142
2020-06-28 21:05:36 +02:00
Laurent Destailleur
566c1aaf84
Fix for credit transfer module
2020-06-22 22:54:33 +02:00
Laurent Destailleur
989737af6b
Update website templates
2020-06-19 10:36:19 +02:00
Laurent Destailleur
2f687a3c40
FIX #14033
2020-06-17 17:57:32 +02:00
Laurent Destailleur
15dd1bd705
Merge
2020-06-14 21:50:40 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
180a0a4557
Info for debug
2020-06-07 18:30:46 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Laurent Destailleur
5dd9f4e4c4
Fix travis false positive
2020-06-06 11:36:24 +02:00
Laurent Destailleur
ca3f62e4ac
Doc repair Row size too large
2020-06-05 17:47:52 +02:00
Laurent Destailleur
c7a614bd50
Fix clean data
2020-06-04 17:07:22 +02:00
Laurent Destailleur
2324834b73
Debug modulebuilder for doc generation
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
67f007ea40
Fix length of field. Make some module die.
2020-05-31 23:12:26 +02:00
Laurent Destailleur
5a9d968a75
Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting
2020-05-29 00:02:03 +02:00
Laurent Destailleur
9d7a4cae00
Fix default value
2020-05-28 17:49:56 +02:00
Laurent Destailleur
15f2165c12
Fix work on payment by bank transfer (avoid confusion between record)
2020-05-27 20:14:11 +02:00
Laurent Destailleur
2f1e653f2f
Fix css
2020-05-27 15:29:09 +02:00
Laurent Destailleur
02b9ce5901
Fix length of title
2020-05-25 18:16:36 +02:00
Laurent Destailleur
0409ec00d7
CSS
2020-05-25 13:01:32 +02:00
Laurent Destailleur
0041bca82f
Fix ambiguous param
2020-05-24 23:49:33 +02:00
Francis Appels
875230ed13
Fix missing batch update to varchar(128)
2020-05-23 10:23:26 +02:00
Laurent Destailleur
662970f232
Clean sql file
2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749
Clean code
2020-05-20 23:40:04 +02:00
Laurent Destailleur
cce72ad8d6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/bills.lang
htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b
suggest some fix to debug situation invoices
2020-05-20 19:51:04 +02:00
Laurent Destailleur
51ed77fbf7
Fix
2020-05-20 09:59:01 +02:00