lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

3991 Commits

Author SHA1 Message Date
Laurent Destailleur
eede2f9944 Add telangana province for india 2020-07-11 10:39:12 +02:00
Alexandre SPANGARO
1855d54019 Fix data insertion 2020-07-06 04:31:32 +02:00
Alexandre SPANGARO
0525dd3c1f Fix migration - Move to v13 2020-07-06 03:28:53 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +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
6a37d12bd9 Fix sql type 2020-07-04 16:10:13 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
5afd518718 Update vat rate for Congo 2020-06-30 13:06:44 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
600a24346a Some people are missing this table 2020-06-28 22:09:17 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
2de1433818 FIX #14142 2020-06-28 21:05:36 +02:00
Laurent Destailleur
e2b1b853c0 Minor performance enhancements 2020-06-26 01:44:21 +02:00
Laurent Destailleur
333d4873c3 Properties ->contactid has been renamed into ->contact_id 2020-06-25 12:17:47 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40 FIX #14033 2020-06-17 17:57:32 +02:00
Laurent Destailleur
f0e4fa40f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a Complete #14078 2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2 2020-06-16 22:40:45 +02:00
Laurent Destailleur
15dd1bd705 Merge 2020-06-14 21:50:40 +02:00
Laurent Destailleur
2d5c35b12a Fix debug sepa module 2020-06-14 21:46:32 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2 Fix and improvement on Loan module 
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
  started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
  on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
  values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
  with the new value.
* Can't modify interest in payment if schedule is used (causes the
  inconsistency for value in schedule).
* User right verification on schedule page.
 2020-06-13 09:32:44 +02:00
Laurent Destailleur
dc87d89204
Update 12.0.0-13.0.0.sql 2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623
Update llx_const.sql 2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-12 01:00:15 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343 
NEW convert all subscription in datetime
 2020-06-12 00:47:55 +02:00
Anthony Berton
c00b55c980
Update 11.0.0-12.0.0.sql 2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Anthony Berton
ce7767a154 Create 11.0.0-12.0.0.sql 2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199 Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:37:25 +02:00
Anthony Berton
4a77d06b1e o 2020-06-11 15:45:31 +02:00
Anthony Berton
848c9df537
Add files via upload 2020-06-11 15:38:05 +02:00
Laurent Destailleur
a70e493c5d Migration 2020-06-08 11:43:00 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +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
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +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
ptibogxiv
319710d6aa
Update 12.0.0-13.0.0.sql 2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9
Update llx_subscription.sql 2020-06-04 16:46:36 +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
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
Laurent Destailleur
f63aa7f527 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
 2020-05-31 23:27:20 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
c2a9819daa Debug establishment management 2020-05-29 21:45:50 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
9d7a4cae00 Fix default value 2020-05-28 17:49:56 +02:00
Christian Foellmann
50bac41399 fix #13988 - missing batch field extension 2020-05-28 15:19:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +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
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
02b9ce5901 Fix length of title 2020-05-25 18:16:36 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
0041bca82f Fix ambiguous param 2020-05-24 23:49:33 +02:00
Laurent Destailleur
bf0327952b
Merge pull request #13875 from ptibogxiv/patch-339 
NEW Date shipment from order accepts hours
 2020-05-23 15:42:24 +02:00
Laurent Destailleur
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
 2020-05-23 15:37:00 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339 2020-05-23 15:14:06 +02:00
Francis Appels
875230ed13 Fix missing batch update to varchar(128) 2020-05-23 10:23:26 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +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
954d928467 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 20:11:13 +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
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
51ed77fbf7 Fix 2020-05-20 09:59:01 +02:00
Anthony Berton
702627155c
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-19 15:20:18 +02:00
Laurent Destailleur
514009ca6d Add field position in llx_website 2020-05-18 15:47:21 +02:00
Anthony Berton
ceb3ba0e33
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-16 16:42:20 +02:00
Anthony Berton
e1f8b50961
Delete 11.0.0-12.0.0.sql 2020-05-16 15:39:49 +02:00
Anthony Berton
ddb413c025 Create 12.0.0-13.0.0.sql 2020-05-16 15:37:13 +02:00
ptibogxiv
8d242cacae
Update 12.0.0-13.0.0.sql 
update sql
 2020-05-15 16:04:36 +02:00
ptibogxiv
e00152a845
Rename 12.0.0.-13.0.0.sql to 12.0.0-13.0.0.sql 2020-05-15 16:03:38 +02:00
ptibogxiv
6a0bc86ea6
Create 12.0.0.-13.0.0.sql 2020-05-15 16:03:03 +02:00
ptibogxiv
703fee0635
Update llx_commande.sql 2020-05-15 15:58:01 +02:00
ptibogxiv
1453b8469e
Update 11.0.0-12.0.0.sql 2020-05-15 15:56:16 +02:00
Laurent Destailleur
b26c1757e6 Prepare v13 2020-05-14 16:07:23 +02:00
Anthony Berton
06c08ad045
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-14 15:26:58 +02:00
Laurent Destailleur
a796122f7b Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 14:30:32 +02:00
Laurent Destailleur
1bd00b0e8c Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 12:28:17 +02:00
ptibogxiv
c6e7b2e6a3
Fix date shipment from order 
better for pickup collection with date and hour from order
 2020-05-12 13:39:02 +02:00
Laurent Destailleur
310c5f9eb6 Fix size of field 2020-05-09 21:56:51 +02:00
Laurent Destailleur
bba8ab657e Fix add missing migration 2020-05-08 18:57:15 +02:00
Laurent Destailleur
c98663be4a Fix sql 2020-05-08 14:05:04 +02:00
Laurent Destailleur
94d47c2acd Fix sql 2020-05-08 14:04:17 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Anthony Berton
00b9f8445f Add default const 2020-05-04 17:11:44 +02:00
Laurent Destailleur
c2c0e6517f Fix init data of units D and H. 2020-05-01 22:44:46 +02:00
Laurent Destailleur
3957b74d9a Revert "FIX: add auto incrementation to llx_c_typent.sql" 
This reverts commit 14a3aa2165.
 2020-05-01 22:17:33 +02:00
Laurent Destailleur
994b60b1d8 Revert use of autoincrement not possible with value 0 2020-05-01 22:17:13 +02:00
Laurent Destailleur
efb79a4008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:16:21 +02:00
Laurent Destailleur
10af669719 Fix missing autoincrement 2020-05-01 22:14:09 +02:00
Maxime Lecoq
14a3aa2165 FIX: add auto incrementation to llx_c_typent.sql 2020-04-30 18:21:25 +02:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact 2020-04-28 09:03:17 +02:00
Laurent Destailleur
a40c2fdbfc Debug v12 2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa Look and feel v12 2020-04-28 02:10:26 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
da02863242 Code comment 2020-04-23 12:19:51 +02:00
Laurent Destailleur
69f4a3e7b0 Doc 2020-04-23 11:41:03 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-22 18:28:52 +02:00
Laurent Destailleur
8598fd99c2 if not exists not required 2020-04-22 18:08:02 +02:00
Frédéric FRANCE
63186a60ae
Update 11.0.0-12.0.0.sql 2020-04-22 14:23:38 +02:00
Laurent Destailleur
22162ac57e Fix rounding of quantities 2020-04-22 13:14:50 +02:00
Laurent Destailleur
292d93405d
Merge pull request #13667 from frederic34/patch-4 
Update 11.0.0-12.0.0.sql
 2020-04-22 01:04:24 +02:00
Laurent Destailleur
11e9cc68b7
Merge pull request #13666 from frederic34/patch-1 
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
 2020-04-22 00:37:19 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
 2020-04-21 18:33:11 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/mails.php
 2020-04-21 18:29:50 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Frédéric FRANCE
b0069f4fed
Update 11.0.0-12.0.0.sql 2020-04-20 18:46:11 +02:00
Frédéric FRANCE
f09fa5226a
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql 2020-04-20 18:43:05 +02:00
Laurent Destailleur
f816fae86c Fix a duplicated index 2020-04-20 12:21:13 +02:00
Laurent Destailleur
16806da9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-18 15:49:56 +02:00
Laurent Destailleur
f0f28c83cd Add fk 2020-04-18 15:49:40 +02:00
Laurent Destailleur
f6e77fc0ba
Merge pull request #13602 from oscim/patch-37 
Update llx_commandedet.key.sql
 2020-04-18 15:48:53 +02:00
Laurent Destailleur
e050429854
Update llx_commandedet.key.sql 2020-04-18 15:48:45 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
619014726e Fix char of account of us 2020-04-16 17:19:18 +02:00
Frederick Jost Zweig
49d5469904
Added basic charts of accounts for USA and Canada. 2020-04-15 13:29:51 +03:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
oscim
f4c346cdbb
Update llx_commandedet.key.sql 
add external key
 2020-04-14 07:48:34 +02:00
Laurent Destailleur
52b467d2fc FIX #13550 Removed not used table 2020-04-12 19:06:44 +02:00
Laurent Destailleur
51eea01505
Merge pull request #13584 from pstructures/develop 
Installation issue
 2020-04-12 16:38:08 +02:00
Matt Sidnell
7c72e40659
Installation issue 
Installation SQL issue due to a ';' instead of a ','.
 2020-04-12 15:21:14 +01:00
Frédéric FRANCE
33a926e251
Update llx_categorie_website_page.key.sql 2020-04-12 09:08:27 +02:00
Laurent Destailleur
6a955da4e9
Merge pull request #13546 from oscim/patch-33 
Update llx_societe.key.sql
 2020-04-11 01:31:29 +02:00
Laurent Destailleur
47f00f8bc8
Update llx_societe.key.sql 
Keep only fields that are enough discriminent for new indexes
 2020-04-11 01:31:03 +02:00
Laurent Destailleur
eb3ed7ffdf Complete index on tickets 2020-04-10 20:02:57 +02:00
Laurent Destailleur
6960f79e40
Update llx_ticket.key.sql 2020-04-10 19:59:45 +02:00
philazerty
0aab98abff
Index optimization for ticket 
When there are a lot of tickets, the search can be long without these indexes.
 2020-04-10 17:05:53 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/perms.php
 2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used 
#13547
 2020-04-10 11:54:14 +02:00
Laurent Destailleur
8567001a46
Merge pull request #13549 from oscim/patch-34 
Update llx_societe_rib.key.sql
 2020-04-10 11:11:13 +02:00
oscim
2887ae3f00
Update llx_societe_rib.key.sql 
fix key in table
 2020-04-10 08:54:39 +02:00
oscim
2df7d79421
Update llx_societe.key.sql 
Add index in table for optimise search in big database
 2020-04-09 15:54:25 +02:00
Laurent Destailleur
87ff94fc64 Add generic fields 2020-04-05 03:59:23 +02:00
Laurent Destailleur
8454598722 WIP Add tables to manage categories of website pages. 2020-04-04 18:59:26 +02:00
Laurent Destailleur
9849afd3dd WIP Add tables to manage categories of website pages. 2020-04-04 18:53:38 +02:00
Laurent Destailleur
237615aa71 Fix offset for ecuador must be ID of country so 84 + 5 zeros 2020-04-03 02:35:55 +02:00
Laurent Destailleur
b669aca1a0
Merge pull request #13483 from fabianpc/db_ecuador 
NEW : Chart of accounts to Ecuador
 2020-04-03 02:32:30 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
3408f67348 Clean orhpelins in llx_product_association 2020-04-02 16:00:09 +02:00
Laurent Destailleur
c225f35eff
Update 11.0.0-12.0.0.sql 2020-04-02 12:49:20 +02:00
Christian Foellmann
6aa65f1a02 change batches max length to 128 characters on sql migration 2020-04-01 09:57:51 +02:00
Laurent Destailleur
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +02:00
Fabian Palacios
ae4fb855d7 chart of accounts to Ecuador 2020-03-31 10:10:22 -05:00
Fabian Palacios
db18226493 Chart of accounts to Ecuador 2020-03-31 10:08:37 -05:00
ATM john
035bb671f2 Fix sql ; missing 2020-03-31 16:32:07 +02:00
ATM john
c466beea3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-03-31 16:28:43 +02:00
Laurent Destailleur
be3cc164c6 Increase size for unalterable logs record. 2020-03-30 18:41:21 +02:00
Laurent Destailleur
398812afa5 Add field to store version of encoding of line in blockedlog 2020-03-30 17:47:29 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
fa3bba942f Start to save the VAT src code into table of discounts to reuse them 
later
 2020-03-26 02:01:30 +01:00
Laurent Destailleur
e937b22721 Increase batch number to 128 2020-03-25 19:34:52 +01:00
Alexandre SPANGARO
89de39f199 Move supplier proposal menu to the core 2020-03-23 08:51:38 +01:00
Laurent Destailleur
226f4695cd Fix migration of type of field 2020-03-22 19:48:53 +01:00
Laurent Destailleur
8313ed9ee4
Merge pull request #13388 from OPEN-DSI/new-type-category-from-hook 
NEW add category type from hook
 2020-03-22 19:45:31 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00
VESSILLER
ac5d2fedc5 NEW add category type from hook 2020-03-20 15:40:46 +01:00
Laurent Destailleur
6b3826cbb8
Merge branch 'develop' into patch-25 2020-03-18 19:47:25 +01:00
Anthony Berton
82058f3a78 add phone 2020-03-18 01:17:54 +01:00
Anthony Berton
71e22ee11b Update 11.0.0-12.0.0.sql 2020-03-18 00:55:20 +01:00
Alexandre SPANGARO
af5444806d Work on reconcilation of accouting account 2020-03-16 06:41:14 +01:00
Alexandre SPANGARO
bc717bc6ae Work on reconciliation of accouting account 2020-03-15 07:49:24 +01:00
Laurent Destailleur
6f636d6d69 NEW Add field author public alias for blog post on website module 2020-03-12 20:50:36 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18 
NEW: Accountancy - Add mode intra & export for product or service bought
 2020-03-11 17:08:49 +01:00
Laurent Destailleur
42d417d5d5 Trans 2020-03-08 16:32:00 +01:00
Alexandre SPANGARO
d9b9913e8a NEW: Accountancy - Add mode intra & export for product or service bought 2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16 
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
 2020-02-29 13:02:43 +01:00
Alexandre SPANGARO
98db5232d1 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 14:05:30 +01:00
Alexandre SPANGARO
a85dfaf71e NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 12:09:19 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
5c2fe5f780 Fix migration 2020-02-24 03:06:50 +01:00
Laurent Destailleur
4b4d1bcce2 Fix disable accountancy chart that is deprecated. 2020-02-24 03:05:58 +01:00
ATM john
13790422dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-24 00:18:37 +01:00
Laurent Destailleur
ca39c680c7 Rename field documentpdf into printable (this field already exists due 
to a very old PR nofinished for same goal).
 2020-02-23 23:03:17 +01:00
ATM john
fe4e00b139 Add new params to extrafields forms to allow extrafields to be displayed on pdf documents 2020-02-23 11:32:38 +01:00
ATM john
4117aa56a2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-02-22 11:19:49 +01:00
Laurent Destailleur
7909055ee8 Enhance multilangue support in website module 2020-02-21 11:36:16 +01:00
Laurent Destailleur
c14daa2790 Can set main language and sublanguages of a website 2020-02-19 18:32:04 +01:00
John Botella
6acf10c0d4 extend retained warranty to be available for all invoices 2020-02-19 11:54:55 +01:00
Laurent Destailleur
88b104bc2f
Merge pull request #13121 from aspangaro/12.0_a14 
NEW: Donation - Update FR CERFA to 11580*04
 2020-02-18 23:48:08 +01:00
Alexandre SPANGARO
76a369d351 NEW: Donation - Update FR CERFA to 11580*04 2020-02-17 07:43:24 +01:00
Laurent Destailleur
3792b8c8c8 Fix quote pb reported by travis CI 2020-02-10 15:34:57 +01:00
Laurent Destailleur
9aaed92b49 Fix quotes 2020-02-10 15:33:59 +01:00
Laurent Destailleur
9797fab012
Merge pull request #13069 from aspangaro/12.0_a11 
NEW : Add French farm chart of accounts 2014
 2020-02-10 15:32:59 +01:00
Alexandre SPANGARO
45711bb43c typo 2020-02-10 05:39:49 +01:00
Alexandre SPANGARO
2f2a2aa52a NEW : Add French farm chart of accounts 2014 2020-02-10 05:35:16 +01:00
Laurent Destailleur
058524ff82 Comment 2020-02-10 02:29:09 +01:00
Laurent Destailleur
59e0ab9e04 Fix AT-BASE 2020-02-08 17:08:45 +01:00