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
Norbert Penel
c29a7527ad
accounting austrian
2020-02-08 10:19:38 +01:00
Laurent Destailleur
f114ca9479
Missing column import_key on ticket table
2020-02-07 15:53:50 +01:00
Laurent Destailleur
fe7b79c83c
Fix definition of objects
2020-02-07 15:51:14 +01:00
Laurent Destailleur
4e4fd4c76c
Remove code using a no more used field
2020-02-07 13:15:51 +01:00
Laurent Destailleur
cd58822d98
Can edit a table of resolution code for tickets
2020-02-07 12:48:41 +01:00
Laurent Destailleur
db43b2d3dd
Fix unique key on llx_holiday_users
2020-02-05 13:53:35 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
fc47fa5ec3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/element.php
2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 02:52:46 +01:00
Laurent Destailleur
69a0a1410e
FIX #12991
2020-02-03 02:28:23 +01:00
Laurent Destailleur
047ca32229
Merge pull request #12998 from aspangaro/12.0_a8
...
NEW : Add French foundation chart of accounts 2018
2020-02-02 20:25:47 +01:00
Alexandre SPANGARO
f741c9cd42
NEW : Add French association chart of accounts 2018
2020-02-02 15:05:43 +01:00
Alexandre SPANGARO
91b4f7c663
Merge branch 'develop' into 12.0_a8
2020-02-02 14:44:50 +01:00
Alexandre SPANGARO
4c2c2461f9
NEW : Add French association chart of accounts 2018
2020-02-02 14:43:46 +01:00
Laurent Destailleur
d827e3289a
Removed no more used field "amount" in llx_facture
2020-01-31 15:12:17 +01:00
Laurent Destailleur
f22ad9a9bf
Add column eec in table of countries
2020-01-22 00:36:04 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc
FIX field 'private' on email templates was not managed.
2020-01-20 18:38:53 +01:00
Alexandre SPANGARO
282dc0177f
NEW : Add French association chart of accounts 2018
2020-01-20 09:45:07 +01:00
Laurent Destailleur
206cfcd7fe
Clean code for inventory
2020-01-20 02:07:47 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
00cddc39fd
Fix remove some orphelins in llx_ecm_files
2020-01-19 13:56:16 +01:00
Alexandre SPANGARO
5cf26ad9db
Fix Belgian legal form
2020-01-16 04:31:35 +01:00
Laurent Destailleur
e8fbf45807
Fix v12
2020-01-16 00:03:30 +01:00
Laurent Destailleur
2b9dc44980
Missing tables
2020-01-16 00:03:17 +01:00
Alexandre SPANGARO
a198ca5c43
Merge branch 'develop' into 12.0_a1
2020-01-15 17:00:02 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
64564e75ae
Add entity into unique key
2020-01-15 13:55:17 +01:00
Laurent Destailleur
ef540c6c72
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2020-01-15 13:50:03 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
atm-ph
a088c78279
Fix column type to be as llx_facture
2020-01-15 09:52:12 +01:00
Laurent Destailleur
22b6828e09
Merge pull request #12792 from aspangaro/12.0_a5
...
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
2020-01-10 00:23:54 +01:00
Laurent Destailleur
e8e82ca08c
Standardize columns
2020-01-09 20:11:03 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
d0739af8b4
Debug MRP
2020-01-08 19:04:00 +01:00
Laurent Destailleur
2eb2feff04
More complete repair
2020-01-08 14:16:05 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
20c9035837
Debug MRP
2020-01-07 22:17:40 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Frédéric FRANCE
5b1e3908ca
move migration from 10-11 to 11-12
2020-01-04 10:19:54 +01:00
Alexandre SPANGARO
c3518426bd
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
2020-01-03 22:05:49 +01:00
Laurent Destailleur
68d7195964
MRP
2020-01-02 22:09:08 +01:00
Laurent Destailleur
d93de4b931
FIX Import of customer prices per segment was not possible
2020-01-02 20:08:43 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Alexandre SPANGARO
1f282ad0e4
Merge branch 'develop' into 12.0_a1
2019-12-31 06:48:04 +01:00
Laurent Destailleur
8838dc38db
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2019-12-30 22:25:06 +01:00
Laurent Destailleur
ece8390277
Add tables to store translation of all objects (like llx_product_lang)
2019-12-26 13:23:18 +01:00
Laurent Destailleur
4333cf2040
Show the stripe accoutn of a cu_ and a card_
2019-12-24 12:53:10 +01:00
Florian Mortgat
cbca0f389a
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
2019-12-24 10:00:20 +01:00
Florian Mortgat
7359c4140d
FIX 12.0 - bookmark URLs get truncated to 255 chars - PR rescheduled for merging into the next major version (v12.0)
2019-12-24 09:54:02 +01:00
Alexandre SPANGARO
6b55b600f1
Merge remote-tracking branch 'upstream/develop' into 12.0_a1
2019-12-23 21:31:52 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
Laurent Destailleur
eb32e98127
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-23 14:01:00 +01:00
Laurent Destailleur
a076c3c20c
Add mig file for v12
2019-12-23 13:48:38 +01:00
Laurent Destailleur
22f3b69666
Fix default value for situation invoice
2019-12-22 11:59:38 +01:00
Laurent Destailleur
c0ef3b46ad
Work on MRP module
2019-12-20 15:31:05 +01:00
Laurent Destailleur
d1fdd11b37
Close #10907
2019-12-19 11:32:10 +01:00
ptibogxiv
6789b7bd1e
Fix day scale unit
2019-12-18 18:23:31 +01:00
Laurent Destailleur
451b32674e
Removed duplicate record
2019-12-18 12:15:34 +01:00
Laurent Destailleur
4a734e53a6
Fix column too low.
...
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Francis Appels
95b56f0518
Update 6.0.0-7.0.0.sql
...
timestamp NOT NULL can cause SQL error.
2019-12-17 12:19:35 +01:00
Laurent Destailleur
0ef3de98c6
Try to fix conflict of several stripe accounts
2019-12-15 17:18:09 +01:00
Laurent Destailleur
5d955fa7e0
Update 10.0.0-11.0.0.sql
2019-12-14 13:51:13 +01:00
Laurent Destailleur
7d39554797
FIX Bad type of sql fields
2019-12-13 17:16:21 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Florian Mortgat
b715ecd7d9
FIX bookmark URLs get truncated to 255 chars
2019-12-11 16:42:03 +01:00
Laurent Destailleur
df7a86dd42
Merge pull request #12652 from frederic34/doxygen_societe
...
doxygen societe class
2019-12-09 13:02:49 +01:00
Laurent Destailleur
2b5866aca2
WIP Complete module MRP
2019-12-08 23:45:06 +01:00
Frédéric FRANCE
48564ea760
doxygen societe class
2019-12-08 14:26:59 +01:00
Laurent Destailleur
3030a9fa2a
Fix manifest file was saved but not enabled.
2019-12-07 13:09:55 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Maxime Kohlhaas
83928b4708
Fix duration must be double(24,8) to store seconds
2019-12-01 18:19:22 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
1c58cc5031
Clean doc
2019-11-30 10:59:47 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Laurent Destailleur
b440f2b1f4
Fix a ref is not null
2019-11-26 08:53:54 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Laurent Destailleur
6191307865
Debug v11
2019-11-22 12:22:27 +01:00
Laurent Destailleur
11be3b53f3
Fix migration
2019-11-21 18:39:51 +01:00
Laurent Destailleur
e8bc8b68c1
Fix missing field in migration
2019-11-21 18:17:40 +01:00
Laurent Destailleur
f7319aeefb
Fix size of field
2019-11-20 18:50:03 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Laurent Destailleur
74c85b742e
Fix ref must be null until the generation of ref is ok
2019-11-18 18:09:12 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +01:00
Laurent Destailleur
502626156e
Work on MRP module
2019-11-17 01:23:19 +01:00
Frédéric FRANCE
5c0976a778
doxygen accountancy class
2019-11-16 09:58:14 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
8ef9728470
Fix permission on file
2019-11-14 17:28:23 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Alexandre SPANGARO
1a9c430e00
Add migration
2019-11-14 04:53:13 +01:00
Frédéric FRANCE
9dcf53c65e
add tables
2019-11-13 20:56:36 +01:00
Frédéric FRANCE
05ab4f79ef
categories for actioncomm
2019-11-13 18:44:11 +01:00
Frédéric FRANCE
4f90fe0fd2
Update 10.0.0-11.0.0.sql
2019-11-12 21:34:45 +01:00
Frédéric FRANCE
422d893ecc
Update llx_c_action_trigger.sql
2019-11-12 21:33:42 +01:00
Alexandre SPANGARO
812c032754
NEW French new regions
2019-11-12 15:56:11 +01:00
Laurent Destailleur
2c718af26c
Missing container type 'menu'
...
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
Laurent Destailleur
3054177e79
Fix type of tickets
2019-11-10 12:28:30 +01:00
Laurent Destailleur
880ecda098
Fix name of tables
2019-11-10 12:23:21 +01:00
Laurent Destailleur
eb378b45a4
Work on BOM - MO module
2019-11-09 20:35:45 +01:00
Laurent Destailleur
59d83fce59
Debug MRP module
2019-11-09 19:57:38 +01:00
Laurent Destailleur
a901ce932d
Repair
2019-11-07 14:19:52 +01:00
Laurent Destailleur
56c20b1d2b
Merge pull request #12350 from frederic34/patch-14
...
missing table product_fournisseur_price_extrafields
2019-11-07 11:30:51 +01:00
Frédéric FRANCE
f292b1f244
missing table product_fournisseur_price_extrafields
...
@Tim-Otte
2019-11-05 22:25:30 +01:00
Frédéric FRANCE
bbf962842e
add icons
2019-11-05 21:09:11 +01:00
Laurent Destailleur
7c4942b7be
Fix debug BOM/MO
2019-11-05 20:14:33 +01:00
Laurent Destailleur
1b701f162a
FIX #12307
2019-11-05 13:16:39 +01:00
Laurent Destailleur
b4d72e3e96
Fix link to setup of social network module
2019-11-05 10:00:46 +01:00
Frédéric FRANCE
7ecdfa7c96
oups
2019-11-03 22:51:42 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
c63db01d5f
Merge branch 'develop' into patch-234
2019-11-02 16:20:24 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
906f30773d
Merge pull request #12269 from atm-ph/new_edit_comment
...
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Laurent Destailleur
036c1410c7
NEW Save user of last modification in donation record
2019-10-31 23:17:08 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
atm-ph
2f68a73a2a
New update comments is now available
2019-10-30 15:45:04 +01:00
Frédéric FRANCE
dd5a9f4753
clean
2019-10-27 17:56:49 +01:00
Frédéric FRANCE
08f182fe98
Update llx_mrp_mo.key.sql
2019-10-27 17:49:41 +01:00
Frédéric FRANCE
0052349a6a
Update 10.0.0-11.0.0.sql
2019-10-27 17:48:11 +01:00
Frédéric FRANCE
e271aa6318
Update 10.0.0-11.0.0.sql
2019-10-27 17:41:40 +01:00
Frédéric FRANCE
136762dfcd
Update 10.0.0-11.0.0.sql
2019-10-27 17:24:36 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-27 17:03:50 +01:00
Laurent Destailleur
7f1b67f0e4
Add warehouse for production on MO
2019-10-27 16:28:03 +01:00
Laurent Destailleur
83a5cfbd1c
Support events on BOM
2019-10-27 02:05:43 +02:00
Laurent Destailleur
eb112d4012
Add qty frozen and disable stock change flag on BOM
2019-10-27 01:49:31 +02:00
Laurent Destailleur
8a22dcdbcb
Add sql for MO
2019-10-26 22:49:16 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
1cd1152290
Merge pull request #12193 from dolibarr95/patch-56
...
NEW: package sql data
2019-10-22 19:25:32 +02:00
dolibarr95
af8f5948f0
Package tables
...
llx_expedition_package and llx_c_shipment_package_type
2019-10-22 13:54:50 +02:00
ptibogxiv
c3fac0b8c9
Update llx_adherent_type.sql
2019-10-22 12:52:41 +02:00
ptibogxiv
d77215c40e
Update llx_adherent_type.sql
2019-10-22 12:52:14 +02:00
Laurent Destailleur
8aacfcdfbd
Merge branch 'develop' into patch-234
2019-10-22 12:46:39 +02:00
Laurent Destailleur
1ba9c31b37
Add migration of index
2019-10-22 12:34:03 +02:00
Laurent Léonard
b5aab50194
Add index on fk_origin_line column of llx_expeditiondet table
2019-10-22 06:07:11 +02:00
dolibarr95
c235740544
parcel to package
2019-10-21 08:58:13 +02:00
dolibarr95
16bd837dc7
create file
...
Dictionary of package type
2019-10-21 08:54:59 +02:00
dolibarr95
6a55aedf59
Create file.
...
List of parcels details related to an expedition.
2019-10-21 08:46:07 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
2d017a6c80
Fix migration
2019-10-17 20:09:24 +02:00
Laurent Destailleur
005b1b12c4
Work on sort of permission per family+module
2019-10-17 19:33:06 +02:00
Laurent Destailleur
87ec1de78e
Start to work on solution to sort permissions by module
2019-10-17 18:43:07 +02:00
Laurent Destailleur
e94d47daf7
Work on MRP module
2019-10-15 19:57:23 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Laurent Destailleur
7973b03201
NEW Add estimated duration on the BOM module
2019-10-14 11:38:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Laurent Destailleur
dfaf2ae34b
Trans
2019-10-11 19:20:52 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e
NEW Can set a squarred icon on your company setup
2019-10-11 11:27:05 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Laurent Destailleur
29384d9a71
Merge branch 'develop' into patch-187
2019-10-09 13:02:47 +02:00
Laurent Destailleur
a8fbefed8c
Update 10.0.0-11.0.0.sql
2019-10-08 19:42:40 +02:00
Laurent Destailleur
dcc4fa6a64
Merge branch 'develop' into patch-255
2019-10-08 19:37:42 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +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
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +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
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-07 07:57:05 +02:00
Laurent Destailleur
d4bb6490e9
Fix migration
2019-10-06 16:25:22 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +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
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
Frédéric FRANCE
edf559697a
restore unfinished old commit
2019-10-01 23:47:45 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
florian HENRY
d48f0fa791
resolve conflixt
2019-10-01 18:07:59 +02:00
Frédéric FRANCE
9755d15f52
work on migration script
2019-10-01 17:51:44 +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
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +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
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +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
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +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
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
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +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
Frédéric FRANCE
230c14e189
add social networks
2019-09-12 22:32:41 +02:00
Frédéric FRANCE
bed959bb38
add entity
2019-09-12 21:17:52 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Frédéric FRANCE
3e11476810
add socialnetworks dictionary
2019-09-11 23:09:20 +02:00
Frédéric FRANCE
e0f17cc71c
add socialnetworks dictionary
2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
ptibogxiv
651fbde64d
Merge branch 'develop' into patch-187
2019-09-10 20:46:54 +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
ca71f02d41
Merge branch 'develop' into develop_pdf
2019-09-06 23:30:12 +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
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
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
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
atm-greg
7c136e77ec
bad migration file
2019-08-12 15:18:40 +02:00
atm-greg
f8ad8d72c0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement
2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769
add fk_projet on stock movements
2019-08-12 15:08:15 +02:00
Laurent Destailleur
86d39b435b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:42:11 +02:00
Laurent Destailleur
5ca988b3d2
Fix position of requests
2019-08-12 02:36:15 +02:00
Frédéric FRANCE
d55377981c
Update 10.0.0-11.0.0.sql
2019-08-07 13:27:55 +02:00
Frédéric FRANCE
28100f67ac
Update llx_c_price_expression.sql
2019-08-07 13:25:14 +02:00
ptibogxiv
f7134340e8
Update llx_product.sql
2019-08-04 13:22:01 +02:00
Laurent Destailleur
85dbec6ae7
Move sql in correct migration file
2019-08-01 16:33:34 +02:00
ptibogxiv
ace01f7442
Fix wrong sql update version
2019-08-01 16:29:42 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Laurent Destailleur
3a740313fe
Merge branch '10.0' into 10.0
2019-07-25 18:31:26 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
e88ca8ae89
Fix migration
2019-07-25 15:07:24 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
jcp
cfaf9ce0ea
SET special_code=4 for existing records
2019-07-22 11:44:18 +02:00
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +02:00
Laurent Destailleur
5d1a50bcb4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-20 14:03:18 +02:00
Laurent Destailleur
ac8a776113
FIX Column 'paid' missing in expense report
2019-07-20 14:02:53 +02:00
Laurent Destailleur
826851e1a9
Fix migration
2019-07-20 14:01:00 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Alexandre SPANGARO
8b8aaafc05
Merge branch 'develop' into 10.0_intracommreport
2019-07-20 05:47:31 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
fafb7956de
Fix position of triggers
2019-07-19 18:52:44 +02:00
Laurent Destailleur
a55da8f8f8
Fix migration
2019-07-19 17:20:33 +02:00
Alexandre SPANGARO
21bd46fc15
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda
NEW Extrafields on salaries
2019-07-17 14:09:25 +02:00
Laurent Destailleur
fed598236c
Add field
2019-07-17 01:12:48 +02:00
Laurent Destailleur
61a574701b
New Add field prefix_session in llx_events
2019-07-17 01:11:10 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
2019-07-14 00:19:56 +02:00
Regis Houssin
332abd2a9f
FIX __INFOS__ tag not exists
2019-07-13 11:02:45 +02:00
Laurent Destailleur
e5d34de877
FIX compatibility mysql 8. rank is reserved
...
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Laurent Destailleur
4387d40b9a
Translation lignes -> lines
2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
46f590f0be
Add column iplastlogin and ippreviouslogin
2019-07-01 15:44:34 +02:00
Alexandre SPANGARO
9da91c06ed
Merge branch 'develop' into 10.0_intracommreport
2019-06-26 15:11:43 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2019-06-25 23:14:49 +02:00
Laurent Destailleur
83f5b23ade
Doc
2019-06-25 22:39:04 +02:00
Laurent Destailleur
85919d8324
Code comment
2019-06-25 22:02:19 +02:00
Laurent Destailleur
33ce52364a
Drop no more used column
2019-06-25 16:08:22 +02:00
Laurent Destailleur
06b3f6a62f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
Laurent Destailleur
b8b0ad0d27
Fix migration
2019-06-25 11:22:35 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Alexandre SPANGARO
4a84dcaa62
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-06-23 21:47:34 +02:00
Laurent Destailleur
22b91f3693
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 13:28:44 +02:00
Laurent Destailleur
64de57d781
FIX bad request
2019-06-22 13:28:20 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
faadae8157
Code comment
2019-06-20 15:59:45 +02:00
Alexandre SPANGARO
69f15db4e9
Fix migration - Move to v11
2019-06-20 09:37:23 +02:00
Alexandre SPANGARO
20b516885f
WIP
2019-06-20 09:33:01 +02:00
Laurent Destailleur
06e5fbd649
Merge pull request #11132 from ptibogxiv/patch-174
...
NEW add API shipment mode dictionnary
2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b
Fix migration
2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174
2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2
Update 9.0.0-10.0.0.sql
2019-06-20 03:54:50 +02:00
Laurent Destailleur
d8c2007d92
Prepare v11 alpha
2019-06-20 03:53:33 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
Laurent Destailleur
b4cb440b0f
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql
...
Fix bom sql
2019-06-20 02:58:24 +02:00
Alexandre SPANGARO
abfb708044
Merge branch 'develop' into 10.0_intracommreport
2019-06-19 21:43:40 +02:00
Laurent Destailleur
13abfc3140
Code comment
2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/expensereport/list.php
htdocs/holiday/list.php
2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-18 16:04:48 +02:00
Laurent Destailleur
6afda6a47a
FIX invalid link on user.fk_user
2019-06-18 15:57:22 +02:00
Laurent Destailleur
8835b49f3f
Debug the accounting-file tool
2019-06-18 14:30:13 +02:00
Nicolas ZABOURI
96c6994827
FIX 2 déclarations of date_valid in SQL
2019-06-18 10:55:16 +02:00
Laurent Destailleur
4f03d4f642
Merge branch '10.0' into patch-189
2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7
Fix migration
2019-06-16 17:25:42 +02:00
ptibogxiv
d838ced12e
Update 9.0.0-10.0.0.sql
2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249
Update llx_bom_bom.sql
2019-06-14 18:39:05 +02:00
ptibogxiv
c6ab092af1
add capacity value for product
2019-06-14 09:12:53 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export
2019-06-12 13:27:49 +02:00
Laurent Destailleur
a70a14b145
Fix migration
2019-06-04 20:06:44 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
664e0b81d8
Debug module BOM
2019-06-03 22:07:34 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
ea58f8a617
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-02 11:49:49 +02:00
Laurent Destailleur
5f0fbcea9a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
Regis Houssin
063fe35c97
FIX missing encrypt llx_const fields
2019-05-30 11:45:55 +02:00
Regis Houssin
bdd54ae245
FIX missing llx_const encrypt
2019-05-30 11:42:28 +02:00
Laurent Destailleur
ae597e7b63
Merge pull request #11252 from KlaasOl/patch-2
...
Create llx_accounting_account_nl.sql
2019-05-29 12:25:42 +02:00
KlaasOl
4301cd5b7a
Update llx_accounting_abc.sql
...
Adding chart of account NL VERKORT
2019-05-26 15:40:44 +02:00
KlaasOl
f879225032
Create llx_accounting_account_nl.sql
...
First accounting account scheme for Dutch accounting
2019-05-26 15:29:50 +02:00
Laurent Destailleur
b7a3cdd7c6
Debug BOM module
2019-05-26 01:31:54 +02:00
Laurent Destailleur
9f9f3bda63
Debug BOM module
2019-05-26 01:06:19 +02:00
Laurent Destailleur
a5865d3e4a
Debug BOM
2019-05-25 19:29:33 +02:00
Alexandre SPANGARO
d9e9cb2ea9
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-20 15:02:05 +02:00
Alexandre SPANGARO
ba4bd274c0
WIP
2019-05-20 14:52:06 +02:00
Alexandre SPANGARO
e81dcb6060
WIP Update database
2019-05-19 21:26:49 +02:00
florian HENRY
c3dbbe51cf
fix missing migration sql for ticket now stable on 10
2019-05-18 23:57:00 +02:00
Laurent Destailleur
a1ec074d03
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type
...
FIX: add contact types for supplier proposals (Issue #10949 )
2019-05-18 16:56:40 +02:00
ATM-Marc
2c104ccc4a
NEW: contact types for supplier proposals
2019-05-18 14:22:04 +02:00
Norbert Penel / OSCSS
13b75e35a0
FIx tms field made with modulebuilder
...
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
2019-05-18 00:20:44 +02:00
Laurent Destailleur
bd1ed4f7ac
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-16 21:26:20 +02:00
Laurent Destailleur
0d6841dacb
Merge pull request #11176 from aspangaro/10.0_FEC
...
FIX FEC Remove useless field 'validated'
2019-05-16 21:20:20 +02:00
Alexandre SPANGARO
60d00e2f5c
FIX FEC Remove useless field 'validated'
2019-05-14 06:46:06 +02:00
Alexandre SPANGARO
7c9ccee64d
NEW Accountancy - Differentiated export
2019-05-14 05:45:36 +02:00
Laurent Destailleur
7a75567ad9
FIX Debug ticket module
2019-05-12 16:34:49 +02:00
Laurent Destailleur
cdebca14a7
Fix migration
2019-05-09 17:32:13 +02:00
Laurent Destailleur
1c558c685c
Fix class not found
2019-05-09 17:16:35 +02:00
Laurent Destailleur
95bb8a1f75
Update llx_c_shipment_mode.key.sql
2019-05-08 01:57:39 +02:00
Laurent Destailleur
249893a4ab
Update 9.0.0-10.0.0.sql
2019-05-08 01:57:23 +02:00
Laurent Destailleur
53b1dec317
Update 9.0.0-10.0.0.sql
2019-05-08 01:56:52 +02:00
ptibogxiv
e65c8399e6
Update 9.0.0-10.0.0.sql
2019-05-05 19:14:09 +02:00
ptibogxiv
499798b2e0
Update llx_c_shipment_mode.key.sql
2019-05-05 19:11:18 +02:00
ptibogxiv
15cff25bbc
Update llx_c_shipment_mode.sql
2019-05-05 19:10:39 +02:00
ptibogxiv
f0fd0ece60
Update 9.0.0-10.0.0.sql
2019-05-05 15:06:10 +02:00
ptibogxiv
7033243572
FIX url lettre max & colissimo
2019-05-05 15:02:00 +02:00
Laurent Destailleur
3a8d645fb9
Debug module ticket
2019-05-01 20:55:46 +02:00
Ferran Marcet
7a651b5071
New: Add ref_client field on template invoice
2019-04-26 13:53:22 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
6884999ee3
Merge pull request #10925 from ptibogxiv/patch-146
...
NEW morphy value in member type
2019-04-25 03:00:25 +02:00
Laurent Destailleur
68d438b697
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/user/class/user.class.php
2019-04-25 01:50:48 +02:00
Laurent Destailleur
becf096bf8
FIX ref for table without ref manager are set to NULL.
2019-04-25 01:37:08 +02:00
Laurent Destailleur
691159c56b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/js/timesheet.js
2019-04-24 10:24:32 +02:00
Laurent Destailleur
8025fb1ac1
Fix size of column
2019-04-24 10:07:58 +02:00
Laurent Destailleur
e0b71fd258
Fix size of column
2019-04-24 10:07:34 +02:00
atm-greg
3231e54abd
fix actioncomm module for long trigger names
2019-04-23 16:19:58 +02:00
Laurent Destailleur
c0c723a207
Work on inventory feature
2019-04-23 11:00:28 +02:00
Laurent Destailleur
fae2983c2a
Merge branch 'develop' into new_user_hr_fields
2019-04-11 18:27:58 +02:00
Laurent Destailleur
2eeb4b8734
Debug ticket module
2019-04-10 15:45:55 +02:00
Laurent Destailleur
1f6f6f6edb
Track action close for ticket
2019-04-10 13:21:06 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
65e931cfe2
Work on email collector
2019-04-08 21:22:10 +02:00
Laurent Destailleur
321ffb859b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Laurent Destailleur
b23f74eab1
FIX Status of opportunity should never be -1
2019-04-08 12:17:57 +02:00
Laurent Destailleur
9c7464d157
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/list.php
htdocs/societe/card.php
2019-04-04 17:42:12 +02:00
Laurent Destailleur
1ac51b6e06
More complete example to fix migration error from v8
2019-04-04 13:46:01 +02:00
ptibogxiv
3723da43ca
Update 9.0.0-10.0.0.sql
2019-03-27 12:50:16 +01:00
ptibogxiv
63ad6b779a
Update llx_adherent_type.sql
2019-03-27 12:49:26 +01:00
Laurent Destailleur
e7dea3cfe7
Merge pull request #10911 from leangjia/develop
...
Add China regions.
2019-03-26 19:23:08 +01:00
Laurent Destailleur
4c4ad0548d
Fix for creation of index composed with type
2019-03-26 17:56:46 +01:00
liAnGjiA
62767fc059
Update llx_10_c_regions.sql
2019-03-25 10:16:41 +08:00
leangjia
a207a699b6
Add China regions.
2019-03-25 00:21:09 +08:00
Laurent Destailleur
8ca5b2e45f
Rename field
2019-03-22 17:43:53 +01:00
Laurent Destailleur
d8e3624d65
Merge pull request #10851 from wdammak/patch-37
...
Add fk_project to product table
2019-03-21 18:32:49 +01:00
Laurent Destailleur
ae2f76f6bd
Update llx_product.sql
2019-03-21 18:32:40 +01:00
Laurent Destailleur
52b91499ba
Update 9.0.0-10.0.0.sql
2019-03-21 18:31:13 +01:00
Laurent Destailleur
1a8902f23e
Fix migration for compatibility
2019-03-19 12:03:02 +01:00
Laurent Destailleur
6970d066f8
Better compatibility
2019-03-19 11:23:38 +01:00
Laurent Destailleur
a4372e24bf
Migration
2019-03-19 11:21:55 +01:00
Laurent Destailleur
77b675bec1
Merge pull request #10876 from ptibogxiv/patch-143
...
FIX support duration/time units with services
2019-03-19 11:20:13 +01:00
Laurent Destailleur
81fb18befe
Complete unit table
2019-03-19 11:19:46 +01:00
wdammak
56bee8a20f
Update llx_product.key.sql
2019-03-18 20:23:45 +01:00
wdammak
cf0bc88601
Update llx_product.sql
2019-03-18 20:19:30 +01:00
ptibogxiv
eb196ba8e6
Update 9.0.0-10.0.0.sql
2019-03-18 14:25:13 +01:00
ptibogxiv
9178939fe6
ADD week, month, year
2019-03-18 14:21:36 +01:00
ptibogxiv
030048db28
FIX compatibility of minute with php unit value
2019-03-18 14:07:31 +01:00
atm-ph
466a5e2e81
Fix postgreSQL migration
2019-03-18 10:47:56 +01:00
Maxime Kohlhaas
0a0e29a089
New fields on user object for hrm purpose
2019-03-16 08:53:06 +01:00
wdammak
5ee749c19d
Update 9.0.0-10.0.0.sql
2019-03-15 20:46:38 +01:00
wdammak
c9f89f3854
Add fk_project to product table
...
Prepare the generation of a product from a project.
2019-03-15 20:28:28 +01:00
Laurent Destailleur
bca18f22ae
Prepare link with expense report line and document
2019-03-15 16:23:38 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
7e31e6b4f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
c32551cb62
Fix size of varchar
2019-03-13 13:42:14 +01:00
Laurent Destailleur
88c02143fa
Fix missing fields
2019-03-13 13:40:57 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Laurent Destailleur
f356d534cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-11 17:48:03 +01:00
Laurent Destailleur
9c8aff0a28
FIX #10787
2019-03-11 17:47:53 +01:00
Laurent Destailleur
def8e770ca
Fix name of indexes
2019-03-11 17:47:19 +01:00
wdammak
fa3246e70b
Missing index to improve the performance of product/variants display
2019-03-10 03:09:23 +01:00
wdammak
0241b0d4ee
Missing index to improve the performance of product/variants display
...
https://github.com/Dolibarr/dolibarr/issues/10787
2019-03-10 03:05:15 +01:00
Laurent Destailleur
10b9fdc1fd
Fix column definition
2019-03-09 02:05:28 +01:00
Laurent Destailleur
f54eb78260
NEW Show the latest date of subscription in member statistics reports
2019-03-07 12:22:24 +01:00
Laurent Destailleur
e67890bd22
NEW Can enter price with or without tax when entering expense repor line
2019-03-07 11:09:04 +01:00
Laurent Destailleur
1b0aec0847
Complete fields for template invoices
2019-03-06 20:51:07 +01:00
Laurent Destailleur
925def5390
Work on BOM module
2019-03-04 13:37:00 +01:00
atm-quentin
1b9a2e5cfc
FIX migration 9 to 10
2019-02-27 09:27:15 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Laurent Destailleur
014c199173
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin
2019-02-27 01:16:21 +01:00
Laurent Destailleur
9e82c37963
WIP Start module BOM
2019-02-26 19:27:04 +01:00
Laurent Destailleur
3ba69fc93a
Fix missing ; after sql request
2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670
Remove duplicate record
2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5
FXI Remove duplicate record before trying to create unique key
2019-02-25 14:55:29 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Laurent Destailleur
f83f746123
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
2019-02-23 16:03:40 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5
FIX #10638
2019-02-23 15:57:57 +01:00
ptibogxiv
c54c4f8667
Update llx_commande.sql
2019-02-20 12:18:20 +01:00
ptibogxiv
d490dd4dec
NEW POS support in order
...
Save informations for online / API shopping and push to invoice
2019-02-20 12:15:43 +01:00
Laurent Destailleur
51441242bf
Fix sql error
2019-02-19 13:15:11 +01:00
Laurent Destailleur
317f3dd90b
Merge pull request #10603 from wdammak/patch-27
...
Add default warehouse id for a user
2019-02-15 15:06:21 +01:00
Laurent Destailleur
662d707320
Update 9.0.0-10.0.0.sql
2019-02-15 15:06:00 +01:00
wdammak
2fe3b7acc7
Add default warehouse for a user
2019-02-14 19:50:57 +01:00
wdammak
0a8c72c93b
rename column default_warehouse to fk_warehouse
2019-02-14 19:36:23 +01:00
Laurent Destailleur
04942d3016
Merge branch 'develop' into patch-110
2019-02-14 16:11:56 +01:00
Laurent Destailleur
567d92f886
Update llx_prelevement_facture_demande.sql
2019-02-14 16:10:31 +01:00
Laurent Destailleur
00cfee0c37
Update 9.0.0-10.0.0.sql
2019-02-14 16:10:06 +01:00
wdammak
31bcc47b68
Add default warehouse id for a user
...
This will help to organize employees and know the default warehouse for a customer.
2019-02-14 13:47:02 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Laurent Destailleur
5a0d4c4cdc
Merge branch 'develop' into patch-110
2019-02-14 10:32:05 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
ptibogxiv
8f3ffc6520
NEW stripe payment intent
...
use it for stripe
2019-02-12 19:03:45 +01:00
Laurent Destailleur
5fceee3048
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 19:02:19 +01:00
ptibogxiv
85272b8345
NEW support stripe payment prelevement
2019-02-12 18:58:57 +01:00
florian HENRY
914de5e089
fix mùigration script
2019-02-12 18:08:21 +01:00
Laurent Destailleur
f7d183f3ef
Add Kosovo country
2019-02-12 17:43:38 +01:00
florian HENRY
eba4be2335
ad missing files
2019-02-12 17:03:47 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
f311d50201
Fix unique key in accounting_account
...
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 15:53:43 +01:00
Laurent Destailleur
a0c1e5ed84
Fix unique key in accounting_account
2019-02-12 15:43:24 +01:00
Alexandre SPANGARO
13cf3b1d7f
Add subledger in various payment
2019-02-01 15:50:12 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Laurent Destailleur
56838bc659
Fix missing field into migration
2019-01-27 18:11:18 +01:00
Laurent Destailleur
c33860cfab
Merge pull request #10368 from ptibogxiv/patch-91
...
NEW thirdparty in donation if option ON
2019-01-27 18:07:46 +01:00
Laurent Destailleur
70c52e6417
Add field calling_duration in table llx_actioncomm
2019-01-26 01:17:41 +01:00
Laurent Destailleur
b1a4e3abd5
To be sure table is dropped
2019-01-21 16:44:51 +01:00
Laurent Destailleur
0f61a99cc6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 05:51:35 +01:00
Laurent Destailleur
f8b205aae3
Fix missing index
2019-01-21 05:16:23 +01:00
Laurent Destailleur
95bfecdd60
Fix missing index in migration
2019-01-21 05:03:31 +01:00
Laurent Destailleur
9c1339ae06
Fix migration with pgsql
2019-01-21 04:27:30 +01:00
Laurent Destailleur
7493ba018a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-01-20 20:38:26 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
Laurent Destailleur
f7c11ec7f4
Fix unit test on accounting
2019-01-20 17:06:24 +01:00
markus
a45ea9239d
Rename consts and cleanup
2019-01-19 14:24:20 +01:00
ptibogxiv
754714abf7
Update llx_don.sql
2019-01-18 11:23:59 +01:00
ptibogxiv
a36cf5f2c7
Update 9.0.0-10.0.0.sql
2019-01-17 20:34:45 +01:00
ptibogxiv
389b44faa3
Update llx_subscription.sql
2019-01-17 17:41:45 +01:00
ptibogxiv
ee595ca9b5
Update 9.0.0-10.0.0.sql
2019-01-17 17:40:47 +01:00
Laurent Destailleur
003f499eb0
Add url_id into unique index of bank_url
2019-01-09 13:02:19 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
5f9bbbcdd7
Fix migration
2019-01-03 11:12:14 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
e7b3c91645
Fix dump file
2018-12-26 19:10:22 +01:00
Laurent Destailleur
9d5a91b6e8
Merge pull request #10235 from torvista/sql-install
...
Added Andorra, Hungary, Portugal, Slovenia. Spain postcodes
2018-12-17 21:14:48 +01:00
Laurent Destailleur
6ee484e2a2
Fix migration
2018-12-17 09:38:36 +01:00
Laurent Destailleur
e0e298f07b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed
Standardize code.
2018-12-17 03:25:45 +01:00
torvista
54c56ff069
minor error
2018-12-16 22:15:44 +01:00
torvista
6ce76903a5
removed double quotes as per Travis failure
2018-12-16 21:22:31 +01:00
torvista
f5d1eea4dc
added regions and provinces for Andorra, Hungary, Portugal, Slovenia.
...
Spain added postcodes and re-ordered sql in province order to make a logical drop-down picking list.
2018-12-16 18:28:11 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
1c49599a47
Work on cash fence feature
2018-12-15 19:46:51 +01:00
Laurent Destailleur
54ffba793f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
htdocs/langs/en_US/admin.lang
2018-12-15 18:21:37 +01:00
Laurent Destailleur
33a91ff707
Add missing POS closure feature
2018-12-15 16:47:06 +01:00
andreubisquerra
cdaf048766
First CashControl version
2018-12-15 16:45:36 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master
...
First CashControl version
2018-12-15 16:44:24 +01:00
Laurent Destailleur
6761e21921
Update 8.0.0-9.0.0.sql
2018-12-15 12:52:09 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members
2018-12-14 11:39:02 +01:00
Laurent Destailleur
63aa7ac1ec
Fix name of key
2018-12-14 11:16:05 +01:00
Laurent Destailleur
3765db422a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/tables/llx_loan.sql
2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28
Add missing column
2018-12-14 10:56:13 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule
2018-12-14 10:54:09 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
0ecdb0f3bb
Code comment
2018-12-12 13:02:18 +01:00
Laurent Destailleur
ea041693b6
Code comment
2018-12-12 12:54:10 +01:00
Laurent Destailleur
b47e7b2267
Work on new unsubscribe process
2018-12-11 09:49:46 +01:00
Laurent Destailleur
b27ec54379
A better way to manage unsubscribed emails
2018-12-10 14:35:33 +01:00
andreubisquerra
939f31c71f
First CashControl version
2018-12-08 21:33:54 +01:00
Laurent Destailleur
cd3716ff9f
Dolibarize module ticket
2018-12-08 16:37:41 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
b43c2ce839
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:52:12 +01:00
Laurent Destailleur
930312b425
FIX Migration do not create not used table
2018-12-08 11:51:46 +01:00
Laurent Destailleur
9ed34e2b35
FIX Can relaunch install on v8
2018-12-08 11:51:01 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
d2f0c87d8f
FIX Removed not use table
2018-12-08 11:41:08 +01:00
Laurent Destailleur
a44dca7e71
Removed deprecated table
2018-12-08 11:37:47 +01:00
Laurent Destailleur
37fe8afea3
Code comment
2018-12-07 14:54:40 +01:00
Laurent Destailleur
e7c87c31b6
Code comment
2018-12-06 21:32:39 +01:00
Maxime Kohlhaas
b37209565f
Correct sql index change
2018-12-05 16:50:02 +01:00
Laurent Destailleur
d9bb39970f
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/barcode.php
2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/install/mysql/tables/llx_paiementfourn.sql
2018-12-04 13:15:32 +01:00
Maxime Kohlhaas
79b6719b88
Change index
2018-12-04 09:00:53 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Laurent Destailleur
c3e2f73e48
FIX #10144
2018-12-01 19:45:30 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql
2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql
2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911
Update llx_paiementfourn.sql
2018-12-01 00:26:51 +01:00
Laurent Destailleur
dbef8fc380
FIX Add field for data becoming mandatory by some online payment system
2018-11-28 13:13:38 +01:00
Laurent Destailleur
2f2df12f59
Complete dictionary
2018-11-26 18:02:25 +01:00
Laurent Destailleur
200de22807
Missing image in container
2018-11-20 16:48:34 +01:00
Laurent Destailleur
f455e32bef
FIX Some modules templates were visible when it should not
2018-11-20 16:22:16 +01:00
Laurent Destailleur
39621ec686
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-11-19 20:07:51 +01:00
Laurent Destailleur
fb6aa01207
FIX #10030 better german chart
2018-11-19 20:04:31 +01:00
Alexandre SPANGARO
2d55666a0b
NEW Add gender in member card
2018-11-18 21:50:58 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Laurent Destailleur
6d640ab83c
Fix feature to drag and drop rows of table (not generic)
2018-11-15 19:58:06 +01:00
markus
ac0f46f9e5
for Denmark: forme_jurisdisque additions
2018-11-15 11:10:54 +01:00
Laurent Destailleur
7aa042172e
Fix sql error
2018-11-14 13:06:40 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email
...
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
4f7d3e794a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47
FIX #9992
2018-11-11 17:28:17 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql
2018-11-11 17:27:16 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert
...
proposal_supplier has 17 char when the elementtype column can take only 16 char
2018-11-10 14:59:46 +01:00
Laurent Destailleur
f1287578f3
Work on emailcollector
2018-11-09 18:18:17 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
193b153fbf
Work on email collector
2018-11-07 18:02:08 +01:00
Laurent Destailleur
eb9defcf1d
Debug emailcollector
2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87
Debug new modules
2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Laurent Destailleur
98a3af620b
FIX #9934
2018-11-05 09:26:23 +01:00
Laurent Destailleur
67fbb3dbb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
28d5f1d50b
Fix sql syntax error
2018-11-03 11:30:32 +01:00
Maxime Kohlhaas
d1133916e0
Fix tracking field in dictionnary should not be mandatory
2018-11-01 15:33:14 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
c9ef298839
Fix setup template emails
2018-10-31 11:38:04 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
622f31fd1e
Fix ref
2018-10-26 19:01:42 +02:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
Laurent Destailleur
b7d91c30d9
FIX missing symbol for indian rupies
2018-10-23 12:38:12 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
atm-greg
ff92572d56
add insurance amount on loan
2018-10-18 17:03:49 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Laurent Destailleur
eff0e959b3
Fix duplicate column
2018-10-10 13:06:54 +02:00
Laurent Destailleur
9fe3e7b6c0
Fix phpunit
2018-10-09 17:09:33 +02:00
Laurent Destailleur
1d04ce2185
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-10-09 17:07:32 +02:00
Laurent Destailleur
dc498173c8
Code comment
2018-10-09 16:58:55 +02:00
Laurent Destailleur
c401739fed
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 16:28:03 +02:00
Laurent Destailleur
b4b82ce3d6
Drop both contraint and index
2018-10-09 16:25:57 +02:00
Laurent Destailleur
bde5ee1232
Merge pull request #9621 from ptibogxiv/patch-69
...
Prepare for more stripe function
2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca
Use more generic name
2018-10-09 16:15:12 +02:00
Laurent Destailleur
422af361b4
Merge pull request #9622 from ptibogxiv/patch-68
...
Prepare for more stripe function
2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9
Update llx_paiement.sql
2018-10-09 16:14:28 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
...
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Laurent Destailleur
41f2289ffa
Save pos station into invoice
2018-10-08 22:28:30 +02:00
Alexandre SPANGARO
75b9862c14
New : Add FEC Export in accountancy
2018-10-08 21:01:21 +02:00
Laurent Destailleur
f9f93f58df
Add field to track source module of invoice
2018-10-07 13:49:09 +02:00
Laurent Destailleur
402a383c83
Uniformize field os social networks
2018-10-07 13:31:40 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
atm-quentin
00f532c436
validation modèle de données
2018-10-04 09:50:39 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +02:00
Laurent Destailleur
56cb0763d1
Add maincolor property on website
2018-10-02 16:46:54 +02:00
Frédéric FRANCE
2b8ec8db1f
Update llx_takepos_floor_tables.sql
2018-09-30 10:33:52 +02:00
Frédéric FRANCE
6f48f37fa0
Update 8.0.0-9.0.0.sql
2018-09-30 10:31:08 +02:00
Laurent Destailleur
a4ec613d73
Move sql table
2018-09-28 19:40:44 +02:00
ptibogxiv
a05bdccb06
Prepare for more stripe function
2018-09-27 10:47:58 +02:00
ptibogxiv
78b8881c44
Prepare for more stripe function
...
support refund, dispute, capture....
2018-09-27 10:43:43 +02:00
Carsten Brandt
fee46ac845
Update german accounting file to use rowid
...
- fix "TODO Fix this file to use rowid"
2018-09-27 09:39:00 +02:00
Laurent Destailleur
0004cbde96
Merge pull request #9617 from cebe/fix-german-account-rowids
...
Update german accounting file to use rowid
2018-09-27 09:36:09 +02:00
Carsten Brandt
73ed340766
Update german accounting file to use rowid
...
- fix "TODO Fix this file to use rowid"
2018-09-26 11:52:06 +02:00
IJ
68dc213601
Correct Google+ to plus
2018-09-26 07:36:22 +01:00
IJ
9fd7d98c26
Add social fields
2018-09-26 07:35:26 +01:00
IJ
d063f6fdeb
Add social fields
2018-09-26 07:34:09 +01:00
IJ
c90cd4ae29
Add more social fields
2018-09-26 07:21:21 +01:00
Laurent Destailleur
e6be047178
Work on new management for website module
2018-09-25 15:00:37 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Laurent Destailleur
2d8eb034e3
FIX Maxi debug to allow to load chart of account with multicompany
2018-09-17 21:02:07 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/tpl/objectline_view.tpl.php
2018-09-12 18:11:51 +02:00
Laurent Destailleur
fd93a22dca
Fix missing field
2018-09-12 16:45:12 +02:00
Laurent Destailleur
72895bebbf
Add field twitter and facebook
2018-09-12 13:18:03 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Laurent Destailleur
69cf7026eb
NEW Close #9296 Add field ref_ext into llx_categorie
2018-09-04 11:29:52 +02:00
Laurent Destailleur
f2ec94e9fd
FIX #9353 Bug: html error - div inside span on graphs
2018-09-04 11:13:54 +02:00
Laurent Destailleur
6b3ccddb65
FIX #9396
2018-09-04 10:14:45 +02:00
Laurent Destailleur
540999faa5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
2018-09-03 14:06:51 +02:00
Laurent Destailleur
47655f0725
Add comment as FIXME
2018-09-03 14:00:12 +02:00
Laurent Destailleur
d050c0654b
FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart
2018-09-03 13:14:25 +02:00
Laurent Destailleur
c5c0491ea7
Fix restaure behavior account_parent point ro rowid
2018-09-03 12:59:20 +02:00
Laurent Destailleur
bf6463b152
Revert old behaviour
2018-09-03 12:54:20 +02:00
Laurent Destailleur
c423aebdad
Revert "FIX "account_parent" is linked with "account_number" instead rowid"
...
This reverts commit b1a340b193
2018-09-03 12:51:20 +02:00
Laurent Destailleur
e9f3c131ec
Add the line -- ADD xxx to rowid
2018-09-03 12:42:26 +02:00
Laurent Destailleur
3593b5ac51
Revert "Revert " New:Algerian Chart of accounts""
...
This reverts commit 1d644a33a3
2018-09-03 12:39:01 +02:00
Laurent Destailleur
1d644a33a3
Revert " New:Algerian Chart of accounts"
2018-09-03 11:42:01 +02:00
Bahfir Abbes
09b75fc53e
Update llx_accounting_account_dz.sql
2018-09-02 16:52:41 +01:00
Abbes Bahfir
28a146fb5e
New:Algerian Chart of accounts - First version
2018-09-02 16:44:07 +01:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
bb2f5ad588
Fix missing migration
2018-09-01 11:30:14 +02:00
Laurent Destailleur
ca2e9f20f6
Fix missing extrafield table
2018-08-31 18:39:13 +02:00
Laurent Destailleur
2db84a679e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
0a7ce338f9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
ad0cc098ee
Fix alter forgot
2018-08-28 01:37:25 +02:00
gauthier
79aa390fe8
FIX : table llx_chargessociales doesn't exists
2018-08-27 15:07:19 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
2cbbb6e622
Prepare 8.0.0 release
2018-08-13 23:04:58 +02:00
Laurent Destailleur
f96dd391fa
Fix error in foreign key pointing to old table
2018-08-13 16:11:23 +02:00
Laurent Destailleur
d09850522b
Fix migration
2018-08-12 22:27:54 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
John BOTELLA
06be98c638
add date field
2018-08-08 17:36:39 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
atm-greg
be63f0dc89
add migration for desc_fourn
2018-08-07 09:49:57 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
7063850034
add sql field
2018-08-06 16:32:25 +02:00
Regis Houssin
b1a340b193
FIX "account_parent" is linked with "account_number" instead rowid
2018-08-03 14:01:00 +02:00
Regis Houssin
fa32e48b8a
FIX change column "account_parent" and missing modify column
2018-08-03 13:53:12 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3
...
NEW : Add project on salaries
2018-08-02 11:19:34 +02:00
Juanjo Menent
99f29a9764
Revert "FIX multicompany compatibility !"
2018-08-02 10:45:15 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3
2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0
New : Add project on salaries
2018-07-31 07:45:03 +02:00
Laurent Destailleur
8ab03c469a
Fix migration
2018-07-27 13:42:32 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable
2018-07-26 09:41:44 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Regis Houssin
835cb04631
FIX remove rowid for multicompany compatibility
2018-07-24 17:07:08 +02:00
Regis Houssin
d4920521b5
FIX multicompany compatibility !
2018-07-24 15:44:21 +02:00
Regis Houssin
25c93de801
FIX missing drop old postgresql unique key
2018-07-24 11:23:44 +02:00
florian HENRY
2f2ca16e2b
Add DELETE Trigger action into admin event agenda log
2018-07-10 16:44:14 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
cbc17d4658
Fix ecm when using multicompany
2018-07-10 12:03:51 +02:00
Laurent Destailleur
3a593f88f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Laurent Destailleur
5883899bc7
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-07-05 02:33:39 +02:00
Laurent Destailleur
64e778a78f
Fix pgsql migration
2018-07-04 10:26:25 +02:00
Laurent Destailleur
a2f517685e
Fix pgsql migration
2018-07-04 10:21:42 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
c2499f298c
Fix bad name of field
2018-07-02 18:08:55 +02:00
Laurent Destailleur
0f77e3c05c
Fix bad name of field
2018-07-02 17:57:32 +02:00
Laurent Destailleur
63f3143718
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
d8c7c61951
Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into
...
hregis-8.0_canvas
# Conflicts:
# htdocs/product/canvas/product/tpl/list.tpl.php
2018-06-30 18:29:08 +02:00
Regis Houssin
718cbce8eb
Fix: use "visible" field name instead "checked"
2018-06-30 10:58:08 +02:00
Regis Houssin
4c90ff9917
NEW add "checked" field for new list engine compatibility
2018-06-30 10:54:22 +02:00
Laurent Destailleur
31396739f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-30 01:26:59 +02:00
Laurent Destailleur
7fab2ca1f8
Add new field
2018-06-30 01:26:33 +02:00
Laurent Destailleur
a9e78f27d9
Merge branch 'develop' into patch-115
2018-06-30 01:21:58 +02:00
Laurent Destailleur
202ab93c5f
Update 7.0.0-8.0.0.sql
2018-06-30 01:20:57 +02:00
Laurent Destailleur
7984316142
Update 7.0.0-8.0.0.sql
2018-06-30 01:20:44 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117
...
New : fichinter models (like factureRec)
2018-06-30 01:19:03 +02:00
Laurent Destailleur
60c62895bf
WIP Can add tooltips on extrafields
2018-06-28 19:13:23 +02:00
Laurent Destailleur
0490807f9b
Prepare 9.0
2018-06-28 18:36:08 +02:00
Laurent Destailleur
a30789e423
Fix table name
2018-06-27 00:34:45 +02:00
Laurent Destailleur
aa37786596
Fix migration errors reported by Softaculous
2018-06-26 11:51:49 +02:00
Laurent Destailleur
cbe682582e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-26 01:25:24 +02:00
Laurent Destailleur
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Regis Houssin
a78ba20c9b
Fix: update price format
2018-06-25 12:20:08 +02:00
Regis Houssin
3d9b191806
Fix: restore and update example data
2018-06-25 12:16:02 +02:00
Regis Houssin
a6729b0bd1
Fix: change field name and remove obsolete data
2018-06-25 09:10:24 +02:00
Laurent Destailleur
bc71685258
Fix migration error
2018-06-25 08:30:37 +02:00
Laurent Destailleur
c664d0c2fd
Fix phpunit
2018-06-24 18:26:35 +02:00
Laurent Destailleur
a50b62d7e7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-24 10:26:24 +02:00
Laurent Destailleur
4f533be01a
For #9006
2018-06-24 10:26:08 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
ac19a6e211
Merge pull request #8993 from hregis/develop_pgsql
...
Fix: wrong field name, use "type" instead "llx_c_type_fees"
2018-06-22 15:09:31 +02:00
atm-quentin
d53aa71673
NEW advance target filtering can be used everywhere with tpl and fk_element
2018-06-22 10:54:00 +02:00
Laurent Destailleur
cfcedc1170
Fix remove old unique key constraint
2018-06-21 00:11:37 +02:00
Regis Houssin
e1db5ab433
Fix: wrong field name, use "type" instead "llx_c_type_fees"
2018-06-19 19:56:39 +02:00
hythamsoliman81
f461ab5f96
SQL synatx error at llx_website_page.sql
2018-06-17 00:12:06 +02:00
Laurent Destailleur
4900f1f1f1
Fix sql coding style
2018-06-13 23:10:29 +02:00
Laurent Destailleur
094b31a563
Complete migration
2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50
Merge pull request #8954 from mwelters/develop
...
German Accounting Plan SKR03 and SKR04 (mysql/data)
2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6
Update llx_accounting_abc.sql
2018-06-13 21:44:43 +02:00
Laurent Destailleur
074ada10e6
Merge pull request #8940 from aspangaro/8.0-b33
...
Fix : Migration for Romanian chart of accounts
2018-06-13 21:37:50 +02:00
Laurent Destailleur
1e488a6f7f
Merge pull request #8924 from dtix/patch-1
...
Romania vat rate changed
2018-06-13 20:01:48 +02:00
Markus Welters
885904132c
Update llx_accounting_abc.sql
2018-06-13 09:37:12 +02:00
Laurent Destailleur
64537ba9bf
Fix missing field in install
2018-06-11 09:20:26 +02:00
Alexandre SPANGARO
c7e6ee3a1b
Fix : Migration for Romanian chart of accounts
2018-06-10 04:02:35 +02:00
markus
f3a7e2205b
fix typo
2018-06-09 19:07:33 +02:00
markus
9ce10ccef7
Adding SKR03 and SKR04
2018-06-09 19:00:24 +02:00
dtix
e6da000ae8
Romania vat rate changed
2018-06-06 14:48:11 +03:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
4b58158588
Update 7.0.0-8.0.0.sql
2018-05-29 10:47:14 +02:00
Laurent Destailleur
18898558e4
Merge branch 'develop' into patch-13
2018-05-29 10:46:28 +02:00
Laurent Destailleur
01c8b33483
FIX 8870
2018-05-29 10:18:45 +02:00
Laurent Destailleur
0f50b0ffb1
Code comment
2018-05-29 10:00:08 +02:00
BENKE Charlene
a85ba00d2e
Create llx_fichinterdet_rec.sql
2018-05-28 16:42:19 +02:00
BENKE Charlene
0b7342f34b
Create llx_fichinter_rec.key.sql
2018-05-28 16:41:45 +02:00
BENKE Charlene
17016d03fe
Create llx_fichinter_rec.sql
2018-05-28 16:40:36 +02:00
Laurent Destailleur
f3f252e88b
Fix duplicate record before creating primary key
2018-05-27 19:31:03 +02:00
Frédéric FRANCE
d67bed57d9
Update 7.0.0-8.0.0.sql
2018-05-26 11:26:20 +02:00
Frédéric FRANCE
af73e6cd4d
Update llx_paiementfourn.sql
2018-05-26 11:23:49 +02:00
Laurent Destailleur
4a58ae59ed
Fix missing drop of old constraint on old table
2018-05-25 15:54:59 +02:00
Laurent Destailleur
ba6193cff7
Add indonesia provinces
2018-05-25 14:57:30 +02:00
dtix
cca1d26943
Romanian chart of account added
2018-05-22 11:23:59 +03:00
dtix
63e056064e
Create llx_accounting_account_ro.sql
2018-05-22 11:22:04 +03:00
Alexandre SPANGARO
cb815e5e3b
Update works
2018-05-13 07:50:24 +02:00
BENKE Charlene
fcf6ab6ee5
Update 7.0.0-8.0.0.sql
2018-05-12 17:55:14 +02:00
BENKE Charlene
468635867d
Add dateemployementend
2018-05-12 17:52:56 +02:00
Laurent Destailleur
7f704231fe
Fix migration script
2018-05-10 14:20:05 +02:00
Laurent Destailleur
3c6d1ccbac
Merge branch 'develop' into develop
2018-05-10 13:13:53 +02:00
Abbes Bahfir
de8bd3f886
New : Translate accountancy journal menu entries
2018-05-07 08:43:41 +01:00
wdammak
d038bf3e4b
Merge pull request #8 from Dolibarr/develop
...
Update rep
2018-05-06 17:01:44 +01:00
Laurent Destailleur
5fe8249706
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-05-05 23:22:04 +02:00
Laurent Destailleur
a842178689
Fix migration missing steps
2018-05-05 23:20:53 +02:00
Laurent Destailleur
f15da0b980
Fix chart of account initial data for syscohada
2018-05-05 22:15:19 +02:00
Laurent Destailleur
9aaf5b95a7
Merge pull request #8745 from wdammak/patch-5
...
Update llx_entrepot add model_pdf
2018-05-05 12:50:36 +02:00
wdammak
468f970d32
Update llx_stock_mouvement Add model_pdf
2018-05-04 18:10:55 +01:00
wdammak
e34bd1a222
Update llx_entrepot add model_pdf
2018-05-04 18:08:04 +01:00
wdammak
bca8d0844e
Prepare the adding pdf models to the stock module
2018-05-03 00:38:38 +01:00
Laurent Destailleur
9e18c95a3f
Fix migration script
2018-05-02 19:54:07 +02:00
florian HENRY
daf829c9f7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/7.0.0-8.0.0.sql
2018-05-02 08:49:40 +02:00
Laurent Destailleur
14fd740b04
Fix lang must be '' and not empty in email_template
2018-05-01 16:25:06 +02:00
florian HENRY
c84f44a508
fix accountanty in multientity
2018-05-01 12:30:22 +02:00
Laurent Destailleur
6a76242611
Fix record with date_creation empty
2018-04-30 08:59:07 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
fb8ad77378
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2018-04-23 23:09:53 +02:00
Laurent Destailleur
e834eff049
FIX #8650
2018-04-22 20:03:24 +02:00
Laurent Destailleur
98cb95cc41
Fix deprecated labels
2018-04-21 13:19:12 +02:00
Laurent Destailleur
cc5d54faa5
Doc
2018-04-21 01:41:38 +02:00
Laurent Destailleur
7256edc831
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-18 03:28:50 +02:00
Laurent Destailleur
b39755f7b9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-18 00:16:14 +02:00
Laurent Destailleur
013f95f54b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-18 00:02:51 +02:00
Laurent Destailleur
e4635c9401
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-18 00:01:40 +02:00
Laurent Destailleur
c7789d2038
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-18 00:01:06 +02:00
Regis Houssin
ad197d01c1
Fix: avoid error
2018-04-17 21:16:17 +02:00
Regis Houssin
bab32e05e7
Fix: best practice for sequence
2018-04-17 21:08:40 +02:00
Regis Houssin
c07b5d684c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_pgsql
2018-04-17 19:37:38 +02:00
Laurent Destailleur
5f3de7f97e
Doc
2018-04-17 19:23:05 +02:00
Regis Houssin
955ff14c6f
Fix: correct syntax for postgresql
2018-04-17 19:06:14 +02:00
Laurent Destailleur
dd46d97138
Merge pull request #8628 from hregis/develop_multicompany
...
Fix: syntax error with postgresql
2018-04-17 18:55:46 +02:00
Laurent Destailleur
fb81ce5117
Some fixes for postgresl migration
2018-04-17 18:32:04 +02:00
Regis Houssin
6d7bd7ce1e
Fix: syntax error with postgresql
2018-04-17 18:26:37 +02:00
Regis Houssin
9a210c1a91
Fix: syntax error for postgresql > 9.1
2018-04-17 17:33:40 +02:00
Regis Houssin
d89086cb7a
Fix: missing drop constraint with postgresql
2018-04-17 17:25:54 +02:00
Regis Houssin
dd835c4868
Fix: missing drop index with postgresql
2018-04-17 17:18:59 +02:00
Laurent Destailleur
6450f95c90
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 19:13:38 +02:00
Laurent Destailleur
57c03553dd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Regis Houssin
79c34f4d69
Fix: project category is type 6 not 5 !!
2018-04-14 10:03:21 +02:00
Laurent Destailleur
a933e458e7
Repair type of product in invoice table from type of product
2018-04-13 22:57:43 +02:00
Laurent Destailleur
3078b890d4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/stripe/admin/stripe.php
2018-04-13 00:45:39 +02:00
Laurent Destailleur
ecd18da137
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-13 00:43:37 +02:00
Laurent Destailleur
4b38cf5329
Fix request at wrong place
2018-04-12 18:30:07 +02:00
florian HENRY
cd2f6616be
fix index creation with unique name for pgSQL
2018-04-12 16:41:53 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Alexandre SPANGARO
130f270627
Fix : Migration 7.0.0 don't contains all new chart of accounts.
2018-04-10 21:16:36 +02:00
atm-quentin
cc832bd972
FIX Issue #8455
2018-04-10 15:47:06 +02:00
Laurent Destailleur
0bf4381226
NEW The field "visible" on extrafield can accept expression as condition
2018-04-10 15:39:11 +02:00
Laurent Destailleur
a231074012
Save search criteria when using "back to" on accounting account
...
Change type of foreign key to be an integer to avoid CAST in requests
2018-04-09 11:31:24 +02:00
Laurent Destailleur
419b225120
Clean code
2018-04-07 21:11:58 +02:00
Alexandre SPANGARO
3e66f5e25b
Update works
2018-04-06 06:04:03 +02:00
Alexandre SPANGARO
06dc70df09
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
619805c7a5
Update works
2018-04-05 20:40:41 +02:00
Alexandre SPANGARO
2a50e9e6c4
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-02 19:54:30 +02:00
Alexandre SPANGARO
dd04dae652
Update work
2018-04-02 14:03:12 +02:00
Regis Houssin
ef45983f73
Fix: just add fields if not exists
2018-04-02 10:25:15 +02:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Alexandre SPANGARO
3779b6ff1c
Update work on assets type
2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
a5428cc8c7
NEW Module Assets
2018-04-01 21:26:52 +02:00
Laurent Destailleur
a9ac7e1f29
Debug inventory module
2018-03-31 19:20:38 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse
...
NEW: default warehouse field for products
2018-03-29 13:51:37 +02:00
Laurent Destailleur
6d796cfd26
Update llx_product.sql
2018-03-29 13:50:29 +02:00
Laurent Destailleur
03fe0d6b9e
Update 7.0.0-8.0.0.sql
2018-03-29 13:50:08 +02:00
Laurent Destailleur
af11daf186
Merge pull request #8467 from hregis/develop_bug3
...
Fix: missing encrypt for llx_const
2018-03-29 13:43:53 +02:00
Laurent Destailleur
6ccdb52229
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-29 13:30:22 +02:00
Laurent Destailleur
eee1cd9120
Fix data corrupted by v7
2018-03-29 13:29:23 +02:00
Laurent Destailleur
188e5d286d
Fix statut
2018-03-29 13:28:29 +02:00
Marc de Lima Lucio
3646374976
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
2018-03-28 11:54:21 +02:00
Regis Houssin
63a5ff61ef
Fix: missing encrypt for llx_const
2018-03-28 06:44:17 +02:00
Laurent Destailleur
26e2d3c4f0
Clean permissions tables
2018-03-26 16:35:50 +02:00
Laurent Destailleur
e9c4ae8f01
Add type product/service in type of expense report
2018-03-26 14:52:20 +02:00
Laurent Destailleur
6e32e9961f
Syn transifex
2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
Laurent Destailleur
517301f014
Work on subscription reminder
2018-03-21 16:40:09 +01:00
Laurent Destailleur
39228f6221
South africa vat rates
2018-03-18 23:37:46 +01:00
Laurent Destailleur
8223047d4a
South africa vat rates
2018-03-18 23:37:28 +01:00
Laurent Destailleur
c83b0bd53c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/install/mysql/data/llx_accounting_category.sql
2018-03-15 15:11:18 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9
...
NEW Add stats in salaries module
2018-03-15 14:28:35 +01:00
Laurent Destailleur
85e307d6b8
Fix report when group is not dedicated to a country
2018-03-15 12:31:24 +01:00
Laurent Destailleur
b2e4c6cf14
Clean code
2018-03-15 11:53:47 +01:00
Laurent Destailleur
db18db9488
Clean code
2018-03-15 11:27:39 +01:00
Alexandre SPANGARO
9ce6ab915c
Merge remote-tracking branch 'uptream/develop' into 8.0-a9
2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc
NEW Add stats in salaries module
2018-03-15 06:23:20 +01:00
Laurent Destailleur
268b07bcf0
Can add/delete credit card localy
2018-03-14 11:51:13 +01:00
Laurent Destailleur
c78e5d23ea
Work on the customer payment mode tab
2018-03-13 20:23:59 +01:00
Laurent Destailleur
944ba69cd8
Add unique key. Dolibarrize view of stripe card.
2018-03-13 17:32:49 +01:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
Laurent Destailleur
5d512af4b4
Fix migration
2018-03-13 09:53:33 +01:00
ptibogxiv
d6be9651a0
ADD key_account variable for stripe or other gateway
2018-03-13 00:29:28 +01:00
Laurent Destailleur
7362b3f3d7
Add table to store thirparty account in external web sites
2018-03-12 15:59:03 +01:00
Laurent Destailleur
18b6b70f45
Merge pull request #8358 from frederic34/patch-2
...
Update llx_ticketsup.sql
2018-03-12 12:28:40 +01:00
Laurent Destailleur
98b7d4c2e2
NEW Can set the start/end date of service line in invoice templates
2018-03-12 12:27:40 +01:00
Frédéric FRANCE
98320ffad2
Update 7.0.0-8.0.0.sql
2018-03-12 08:36:18 +01:00
Frédéric FRANCE
478b3dfa42
Update llx_ticketsup.sql
2018-03-12 08:34:47 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
florian HENRY
cfdaa7c88d
ticket sup make it work
2018-03-11 16:07:13 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
Laurent Destailleur
c1d148458b
Fix migration
2018-03-09 23:44:00 +01:00
Laurent Destailleur
3ad95e46c0
Fix phpunit
2018-03-08 22:40:42 +01:00
Laurent Destailleur
489dde4db4
Prepare database to store payment modes of customers
2018-03-08 22:26:42 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405
Enhance OAuth module to store the stripe account in llx_oauth_token
2018-03-08 19:51:18 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
fe45e82e99
Fix use of table llx_c_paiement (param showempty was not used/set)
2018-03-07 19:00:38 +01:00
Laurent Destailleur
78cbd92e98
Fix init data on table of payment mode
2018-03-07 18:30:39 +01:00
Laurent Destailleur
94140b04ca
FIX Missing primary key on payment modes
2018-03-07 15:28:50 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
...
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
Laurent Destailleur
d07cd8c04b
Update 7.0.0-8.0.0.sql
2018-03-07 13:11:18 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
72af963ed5
Fix triggers
2018-03-06 12:26:26 +01:00
Laurent Destailleur
a086bd0137
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Marc de Lima Lucio
fad521d66c
FIX: supplier disocunts: add forgotten index to migration script
2018-03-05 12:09:13 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
1f67e115d7
Merge pull request #8239 from hregis/develop_bug2
...
Fix: syntax error
2018-03-02 17:45:31 +01:00
florian HENRY
3490d3779b
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-03-02 17:31:39 +01:00
florian HENRY
473c16ede5
fix pgSQL install
2018-03-02 17:30:46 +01:00
Laurent Destailleur
b87db9d32d
Fix missing ;
2018-03-02 16:38:56 +01:00
Laurent Destailleur
e073fa15f7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-02 14:00:27 +01:00
Laurent Destailleur
8d11f1efa1
FIX Payment mode not correctly set in donation and document
2018-03-02 12:32:49 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
0c4bf2340f
Fix missing primary key
2018-02-28 15:22:58 +01:00
Laurent Destailleur
e2c7585ae7
NEW Support alternative aliases of page name in website
2018-02-28 14:36:22 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency
2018-02-26 09:54:09 +01:00
Regis Houssin
ef60d095c0
Fix: syntax error
2018-02-25 19:55:10 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6
Clean deprecated (field unit_charge in supplier price)
2018-02-25 14:13:09 +01:00
Laurent Destailleur
8dceb8930f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/user/card.php
2018-02-25 12:41:17 +01:00
Laurent Destailleur
c8078b54b5
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
2018-02-24 12:52:57 +01:00
Laurent Destailleur
435e4823a5
Fix some warning during install
2018-02-24 11:58:09 +01:00
Laurent Destailleur
787a137509
Add column for accounting doc
2018-02-23 15:38:39 +01:00
KHELIFA
54dba24ab5
Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-02-23 11:06:07 +01:00
John
b276a8186e
Fix sql entity for sub query
2018-02-21 10:03:04 +01:00
Laurent Destailleur
87a3019e73
Fix upgrade missing steps
2018-02-20 06:03:22 +01:00
Laurent Destailleur
eb0073c330
Fix upgrade missing steps
2018-02-20 05:53:53 +01:00
Laurent Destailleur
31d0679876
Add data
2018-02-19 19:52:51 +01:00
Laurent Destailleur
1ee128ff13
NEW Add type of website container/page into dictionary
2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
daca27b2ed
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
2018-02-14 18:02:40 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
f251113f69
Fix accounting module with multicompany
2018-02-06 01:00:35 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
30c68aecf2
Code comment
2018-02-03 19:52:09 +01:00
Laurent Destailleur
5ab5c12a7b
Code comments
2018-02-03 19:42:00 +01:00
Laurent Destailleur
12aec8f806
Prepare database for invoicing of projects
2018-02-02 15:19:04 +01:00
Laurent Destailleur
cebda2b141
Prepare 8.0
2018-01-28 10:57:12 +01:00
Laurent Destailleur
86e501808c
Merge pull request #7975 from dolibarr95/patch-31
...
Create 7.0.0-8.0.0.sql
2018-01-26 18:03:07 +01:00
Laurent Destailleur
eb3eee9b6a
Code comment
2018-01-26 15:25:47 +01:00
Laurent Destailleur
3c3e02dbea
Fix missing fields
2018-01-21 22:47:15 +01:00
Laurent Destailleur
710cefa3a8
Add missing vat rates
2018-01-21 21:30:11 +01:00
Maxime Kohlhaas
6f248a6590
New allow to define order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
a3a24e2182
Clean chart of account files
2018-01-20 17:52:01 +01:00
Laurent Destailleur
3a8ceb130f
Fix utf8 on all fields
2018-01-19 15:17:19 +01:00
Laurent Destailleur
dcd579242f
Fix <br /> (xml) into <br> (html)
2018-01-17 13:26:57 +01:00
Laurent Destailleur
3f551f0d05
Fix migration
2018-01-17 02:19:32 +01:00
Laurent Destailleur
a84ed841cc
Fix creation date was not filled
2018-01-16 20:47:33 +01:00
Laurent Destailleur
7a88afe962
Fix field enabled and perms must differs
2018-01-13 13:16:33 +01:00
Laurent Destailleur
15ed7584b8
Fix navigation in accounting account card
2018-01-11 17:06:06 +01:00
Laurent Destailleur
9844352193
More complete repair
2018-01-08 15:04:17 +01:00
Laurent Destailleur
968bb8a100
Fix travis
2018-01-08 02:15:20 +01:00
Laurent Destailleur
140ee422a4
NEW Add chart of account for england
2018-01-05 22:06:40 +01:00
Laurent Destailleur
a37019a25b
NEW Add chart of account for england
2018-01-05 22:04:43 +01:00
florian HENRY
2bd8bafc1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2018-01-03 12:06:59 +01:00
Laurent Destailleur
c3f8012dfb
Update vat rates
2018-01-02 23:05:40 +01:00
florian HENRY
320465aeb9
fix : #8003
2018-01-02 09:46:45 +01:00
Laurent Destailleur
ce680af357
Fix field name and length (database portabilit)
2017-12-28 11:16:27 +01:00
Laurent Destailleur
e6c7f9e69b
Debug module inventory
2017-12-22 21:29:09 +01:00
Laurent Destailleur
2b056b0177
BUG Fix of old hidden feature price per quantity
2017-12-22 12:53:46 +01:00
dolibarr95
a33411b8bd
Create 7.0.0-8.0.0.sql
2017-12-20 09:06:11 +01:00
Laurent Destailleur
01c99b780e
Fix missing index
2017-12-19 16:22:47 +01:00
Laurent Destailleur
98b82d712a
NEW Revenue stamp can be a percent
...
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00
Laurent Destailleur
6bace33366
Merge pull request #7955 from fappels/7.0_fix_migration
...
Fix migration script
2017-12-16 01:15:29 +01:00
Laurent Destailleur
929893bd49
Fix regression introduced with task comments
2017-12-15 20:07:35 +01:00
Laurent Destailleur
db91a88c59
Fix error message and migration
2017-12-15 19:54:57 +01:00
Laurent Destailleur
ebdbddb7fd
Fix error message and migration
2017-12-15 19:50:39 +01:00
fappels
bb700494a1
Fix Collation update missing for llx_expeditiondet_batch
2017-12-13 20:39:37 +01:00
Laurent Destailleur
066e04f33d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2017-12-11 00:22:05 +01:00
Laurent Destailleur
e01195f4f1
Merge pull request #7935 from aspangaro/7.0-b1
...
FIX : v7 sql error on init database
2017-12-10 20:58:05 +01:00
Laurent Destailleur
d701a7617b
Fix province nadorgg into nador
2017-12-10 19:04:21 +01:00
Alexandre SPANGARO
cc2ea35c9a
FIX : data
2017-12-10 08:46:50 +01:00
Alexandre SPANGARO
918f25983c
FIX : v7 sql data
2017-12-10 08:27:13 +01:00
Alexandre SPANGARO
ff9c714f88
FIX : v7 sql error on init database
2017-12-10 08:02:57 +01:00
Laurent Destailleur
cf5265d405
Minor fix
2017-12-07 21:44:12 +01:00
Laurent Destailleur
dc04ab3164
Missing field in website module
2017-12-02 13:24:21 +01:00
Laurent Destailleur
6796c08cb8
Debug/rewrite Blockedlog
2017-11-30 14:21:55 +01:00
Laurent Destailleur
6a8388dd57
Add table for online signature
2017-11-25 14:11:34 +01:00
Laurent Destailleur
d90f68837a
Missing migration line
2017-11-25 00:59:25 +01:00
Laurent Destailleur
0ec8c3c296
Merge branch 'develop' into patch-34
2017-11-25 00:57:10 +01:00
Laurent Destailleur
6876049779
Update 4.0.0-5.0.0.sql
2017-11-25 00:56:24 +01:00
Laurent Destailleur
e22d13cf55
Merge pull request #7860 from IonAgorria/resources-country
...
Add country to resource
2017-11-24 16:35:52 +01:00
Laurent Destailleur
831099fef8
Debug modulebuilder
2017-11-24 16:24:42 +01:00
Laurent Destailleur
9f235e1ff6
Standardize database: field ref of warehouse was renamed label -> ref
2017-11-24 15:27:00 +01:00
Laurent Destailleur
6a3dc91414
Standardize code
2017-11-23 15:22:32 +01:00
Laurent Destailleur
5b77fe393e
Fix: contact not preselected
2017-11-23 00:59:43 +01:00
Ion
6428c2157c
Add country to resource
2017-11-23 00:26:25 +01:00
Laurent Destailleur
cf0d67d71c
Generation of pdf become default value
2017-11-17 23:57:32 +01:00
Laurent Destailleur
d326641072
Merge pull request #7813 from hregis/develop_ldap
...
Fix: missing encrypt datafor llx_const
2017-11-17 13:03:22 +01:00
Laurent Destailleur
f708450276
Fix sql error
2017-11-16 22:57:25 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Regis Houssin
a4b96f00df
Fix: missing encrypt datafor llx_const
2017-11-14 16:00:34 +01:00
Laurent Destailleur
2d78136781
Standardize field length
2017-11-13 18:04:14 +01:00
Laurent Destailleur
53bfbcf5db
NEW Ad performances indexes on calendar events
2017-11-13 17:05:07 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf
...
NEW generate also document when invoice is build from recurring template
2017-11-11 17:42:26 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs
2017-11-09 23:39:28 +01:00
Laurent Destailleur
f6a0603fb0
Clean code/constant
2017-11-09 18:16:15 +01:00
Laurent Destailleur
fa999dfa65
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant
...
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
2017-11-06 09:25:14 +01:00
Laurent Destailleur
d0e354f729
Merge pull request #7766 from aspangaro/7.0-6
...
FIX Missing fields for the table bookeeping_tmp on migration
2017-11-05 18:38:01 +01:00
Laurent Destailleur
86eb028beb
Repair datec empty for products
2017-11-04 15:25:52 +01:00
Alexandre SPANGARO
26cb4bc6f6
FIX Missing fields for the table bookeeping_tmp on migration
2017-11-04 08:10:05 +01:00
Alexandre SPANGARO
7e3103356b
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-04 07:14:28 +01:00
Laurent Destailleur
4ac8cb9168
Fix sql syntax
2017-11-03 16:31:33 +01:00
Laurent Destailleur
a346a1a5e9
Work on website module
2017-11-03 15:56:16 +01:00
Laurent Destailleur
55386a3ae2
Work on website module
2017-11-03 13:52:03 +01:00
Laurent Destailleur
fa1fbe7db7
Work on websiteaccounts
2017-11-03 13:25:49 +01:00
Alexandre SPANGARO
2d17e4094c
Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-11-03 06:18:27 +01:00
Laurent Destailleur
d137cef843
Merge pull request #7707 from aspangaro/7.0-SPEC1
...
SPEC #7013 : use database type "double" to store monetary values
2017-11-02 09:54:34 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Alexandre SPANGARO
cc26095467
Update database
2017-10-31 22:04:50 +01:00
Alexandre SPANGARO
a0d186bae6
Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1
2017-10-31 05:53:05 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Alexandre SPANGARO
e7832e3c44
Correct PR
2017-10-29 07:16:04 +01:00
Alexandre SPANGARO
63707dbe10
Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1
2017-10-29 06:58:04 +01:00
Alexandre SPANGARO
16e4e8ada1
Fix SPEC1
2017-10-29 06:56:05 +01:00
Laurent Destailleur
00b505a71c
Fix sql syntax
2017-10-27 01:48:05 +02:00
Laurent Destailleur
5ba64fe620
Merge branch 'develop' into 7.0-pcg6
2017-10-27 01:42:03 +02:00
Laurent Destailleur
ba9ed52bc0
Fix sql norm (string must be ')
2017-10-27 01:40:41 +02:00
Laurent Destailleur
54746a55b5
Merge pull request #7705 from aspangaro/7.0-pcg5
...
NEW Add The SYSCOHADA chart of accounts
2017-10-27 01:17:47 +02:00
Laurent Destailleur
315fce701b
Fix migration pgsql
2017-10-26 18:46:44 +02:00
Laurent Destailleur
d1e7577eed
Fix sql field can't be named 'offset' (reserved word).
2017-10-26 18:30:01 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
ffee915498
Fix field not serial with pgsql
2017-10-26 15:10:52 +02:00
Laurent Destailleur
5f5cbec1cf
Debug module website
2017-10-26 13:09:11 +02:00
Laurent Destailleur
e36cd21d5d
Fix sql
2017-10-26 03:20:43 +02:00
Laurent Destailleur
66d2c29fe1
Work on modulebuilder and website module
2017-10-26 01:02:13 +02:00
Laurent Destailleur
bb996019c2
NEW Support visibility on extrafields
2017-10-25 11:42:14 +02:00
Alexandre SPANGARO
ecbc393c96
FIX SPEC #7013 : use database type "numeric" to store monetary values
2017-10-24 21:14:31 +02:00
Alexandre SPANGARO
735f296b7f
Update pcg_type
2017-10-24 19:31:24 +02:00
Alexandre SPANGARO
22d2598ea1
NEW Add The Moroccan chart of accounts
2017-10-24 19:23:09 +02:00
Alexandre SPANGARO
17e8b6c84c
NEW Add The SYSCOHADA chart of accounts
2017-10-24 19:12:42 +02:00
Laurent Destailleur
72441de1ec
Fix length of fk_mainmenu and fk_leftmenu
2017-10-24 17:35:53 +02:00
Laurent Destailleur
d2f723045c
Work on website and modulebuilder
2017-10-24 17:30:05 +02:00
Laurent Destailleur
e58a52c52b
Merge branch 'develop' into 7.0-pcg4
2017-10-24 12:59:59 +02:00
Laurent Destailleur
deeebac540
Merge branch 'develop' into 7.0-pcg3
2017-10-24 12:58:09 +02:00
Laurent Destailleur
110f2fc5da
Merge pull request #7695 from aspangaro/7.0-pcg2
...
NEW Add The Switzerland chart of accounts
2017-10-24 12:54:48 +02:00
Alexandre SPANGARO
eb6ba2ba55
NEW Add The Tunisia chart of accounts
2017-10-24 07:19:07 +02:00
Alexandre SPANGARO
9e673f7c87
NEW Add The Luxembourg chart of accounts
2017-10-24 07:07:28 +02:00
Alexandre SPANGARO
d43c186777
NEW : Add The accountancy Switzerland chart of accounts
2017-10-24 06:40:54 +02:00
Alexandre SPANGARO
8ba2fb8d4a
New : Add The developed accountancy french plan 2014
2017-10-24 06:05:19 +02:00
Laurent Destailleur
9df3f5c75e
Migration of data
2017-10-23 19:18:17 +02:00
Laurent Destailleur
f083ac5e6b
Prepare database to store country int accounting_system table
2017-10-23 18:56:09 +02:00
Laurent Destailleur
97b694b59c
Fix missing field in migration v6
2017-10-23 10:22:45 +02:00
Laurent Destailleur
f675be650e
Fix missing field in migration v6
2017-10-23 10:21:45 +02:00
Laurent Destailleur
1fe1cb986a
Fix AUTO_INCREMENT PRIMARY KEY does not need NOT NULL
2017-10-22 15:51:07 +02:00
Laurent Destailleur
efb369f857
Merge pull request #7497 from atm-florian/dev_accountancy
...
NEW : lettrage in accountancy
2017-10-22 15:28:53 +02:00
Laurent Destailleur
611f5f638d
FIX #7616
2017-10-22 15:07:41 +02:00
Laurent Destailleur
6bd0550bdd
Remove rowid into script. Must use the autoincrement.
2017-10-22 02:58:31 +02:00
Juanjo Menent
b8c2c1a907
Merge remote-tracking branch 'upstream/develop' into develop
2017-10-21 14:58:52 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Juanjo Menent
f18980a209
NEW: Add Chile accounting plan
2017-10-20 19:02:04 +02:00
Juanjo Menent
47b1cf5a91
NEW: Add Chile accounting plan
2017-10-20 11:55:47 +02:00
Juanjo Menent
6137a17fa6
NEW: Add Chile accounting plan
2017-10-20 10:56:58 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Laurent Destailleur
1b563dbf76
Rename table
2017-10-19 09:29:34 +02:00
Laurent Destailleur
30dad0be12
Split file of chart of account to prepare to load files after install
2017-10-19 09:28:59 +02:00
florian HENRY
4273e507c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
...
dev_accountancy
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
htdocs/accountancy/class/lettering.class.php
2017-10-18 09:52:56 +02:00
Laurent Destailleur
463441c808
Fix bad table name
2017-10-12 18:32:10 +02:00
Laurent Destailleur
1fba58b9ce
Fix bookmark list
2017-10-12 17:09:17 +02:00
Laurent Destailleur
37272b264c
Fix sql
2017-10-11 19:45:18 +02:00
Laurent Destailleur
56be9e2b60
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:19 +02:00
Laurent Destailleur
cd814d420b
Fix repair utf8 mix collation
2017-10-11 16:54:17 +02:00
Laurent Destailleur
f93ecc1584
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/projet/activity/perweek.php
htdocs/projet/element.php
2017-10-10 11:24:17 +02:00
Laurent Destailleur
4de1ade605
Fix mix collation
2017-10-09 18:15:10 +02:00
Laurent Destailleur
15911a9b64
Fix illegal mix collation
2017-10-09 17:45:08 +02:00
Laurent Destailleur
19de053054
Fix itf8 mix collation
2017-10-09 17:43:57 +02:00
Laurent Destailleur
ce7ce82801
Enhance email template editor
2017-10-08 14:51:10 +02:00
Laurent Destailleur
8e187c2759
Debug module website
2017-10-06 22:49:08 +02:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
Laurent Destailleur
afc1938676
FIX #7550
2017-10-06 14:28:01 +02:00
Laurent Destailleur
06b18a740e
NEW Add date of birth on user card.
...
NEW Show expected worked hours on the timesheet form.
2017-10-06 12:08:01 +02:00
Laurent Destailleur
04a56d4bd9
Fix phpunit
2017-10-05 09:34:09 +02:00
Laurent Destailleur
75a7e086b3
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
...
New comment generic element
2017-10-04 11:13:39 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
fef6440ff2
FIX #7541
2017-10-03 16:23:30 +02:00
Laurent Destailleur
0f194d6715
Update llx_holiday.sql
2017-10-03 16:21:44 +02:00
Frédéric FRANCE
dd76672c27
ref can be null
2017-10-03 00:30:42 +02:00
Laurent Destailleur
97d399595f
Add unique key on table to follow leave request counter per type
2017-10-02 17:45:01 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
94ae6c62e6
Add htmlheader field for each page
2017-10-02 00:08:00 +02:00
Laurent Destailleur
9654c4f168
New extrafields are visible into list by default
2017-09-29 13:29:48 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Laurent Destailleur
8242469e40
FIX The unique index on email templates can work now.
2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44
Add email template to send SEPA mandate
2017-09-27 17:40:14 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
15c8515d53
Fix default
2017-09-26 19:08:04 +02:00
Laurent Destailleur
7f420f3246
Complete vat rates for india
2017-09-26 10:54:07 +02:00
Laurent Destailleur
4f76545b62
Add missing fields to manage localtax on supplier products
2017-09-26 10:47:08 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
2017-09-25 19:54:27 +02:00
Laurent Destailleur
58bc30ae9a
Add indian vat
2017-09-25 19:08:17 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
1bb5408d83
FIX #7464
2017-09-24 22:18:10 +02:00
Laurent Destailleur
e1b4788bc2
Update vat rates
2017-09-23 01:52:14 +02:00
Laurent Destailleur
63ec14e47d
Convert sode to send member info email into new generic email template
...
system.
2017-09-22 20:18:11 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
57358f0ce5
NEW Provide a way to download a file from a public URL for files in ECM
2017-09-21 14:02:42 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
arnaud
e7bb7a3588
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-18 17:28:03 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Laurent Destailleur
c11ff4a18c
FIX #7368
2017-09-18 15:55:25 +02:00
Laurent Destailleur
4c97f5514d
FIX #7366 renaming table with pgsql
2017-09-18 15:25:21 +02:00
Laurent Destailleur
0355b0d9ed
Merge pull request #7414 from aspangaro/7.0-4
...
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
d1fd1df345
Add column position on some dictionaries table
2017-09-17 22:52:29 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Alexandre SPANGARO
c2e1e2491d
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-16 06:53:29 +02:00
Laurent Destailleur
a4086b52ef
NEW Can send email from contract card
2017-09-16 01:34:15 +02:00
Laurent Destailleur
ffb3823655
Allow null in stock alert threshold to be compatible with #7162
2017-09-15 23:38:03 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
24cd407cd3
FIX Missing upgrade of fields
2017-09-14 16:52:33 +02:00
Laurent Destailleur
5d920be880
FIX Upgrade missing on field
2017-09-14 16:51:41 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
cda8c6e41a
Fix ref must be 50
2017-09-12 11:51:51 +02:00
Laurent Destailleur
f0f6df4c90
Fix tables declaration
2017-09-11 15:23:49 +02:00
Laurent Destailleur
1f56800a50
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
...
New task discussion
2017-09-11 15:20:13 +02:00
Laurent Destailleur
78ffbd1095
Merge pull request #7369 from hregis/develop_bug
...
Fix: remove table prefix
2017-09-11 15:06:01 +02:00
Laurent Destailleur
403f11759c
Merge pull request #7363 from Gitdyr/develop
...
Danish accounts for accounting
2017-09-11 14:50:58 +02:00
Laurent Destailleur
dcc9cb4a16
Some fixes in various payment
2017-09-11 14:29:27 +02:00
Regis Houssin
f8938f308d
Fix: remove table prefix
2017-09-11 08:17:25 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
974f99ddb2
Increase length of title field
2017-09-11 02:54:21 +02:00
Laurent Destailleur
2ae135baf1
NEW Add view of status of template invoice
2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
01664a135d
Removed not used field
2017-09-10 18:01:34 +02:00
Gitdyr
68a8ef6e2d
Fixed.
2017-09-09 22:21:55 +02:00
Gitdyr
8dbf4bfaee
Danish accounting accounts.
2017-09-09 21:19:02 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
b7197530c2
NEW Each user can edit its own email template (menu tools)
2017-09-08 12:48:01 +02:00
arnaud
82440fd399
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
2017-09-07 16:24:34 +02:00
arnaud
8906c95eea
NEW comments system on task
2017-09-07 16:23:51 +02:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
53a2ef45a5
Fix upgrade
2017-09-06 22:42:01 +02:00
Laurent Destailleur
451adb077f
Fix upgrade
2017-09-06 22:41:29 +02:00
Laurent Destailleur
08eff908bc
Fix missing field in some env
2017-09-06 21:39:33 +02:00
Laurent Destailleur
17310da0f8
Fix missing field in some env
2017-09-06 21:39:10 +02:00
Laurent Destailleur
859d0dfe97
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-06 19:24:42 +02:00
Laurent Destailleur
7a6f3d899c
Fix initial data
2017-09-06 19:21:46 +02:00
Laurent Destailleur
33e2179b65
FIX SQL injection
2017-09-06 18:17:57 +02:00
Laurent Destailleur
f29a4c1fb1
Make accountancy pages responsive
2017-09-05 20:42:34 +02:00
Laurent Destailleur
f5ccd943f1
Fix mix of collation
2017-09-05 20:13:33 +02:00
Laurent Destailleur
e5400a4a36
Fix translation of extrafields
2017-09-02 13:01:41 +02:00
Laurent Destailleur
c1e54b7e23
Merge pull request #7315 from aspangaro/7.0-f2
...
NEW Add project on a various payment
2017-09-02 00:45:36 +02:00
Laurent Destailleur
d71359b634
Update data
2017-09-01 17:42:04 +02:00
Laurent Destailleur
4b9f54e571
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_accounting.sql
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
htdocs/install/mysql/tables/llx_holiday_config.sql
2017-09-01 17:34:57 +02:00
Laurent Destailleur
e13792a555
Fix data for account categories
2017-09-01 15:31:35 +02:00
Alexandre SPANGARO
c4d2ca661f
Merge remote-tracking branch 'uptream/develop' into 7.0-f2
...
# Conflicts:
# htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-01 07:24:55 +02:00
Laurent Destailleur
2ab12f54ff
Fix install error due to too large column with index
2017-08-31 22:42:14 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64
Uniformize code of accounting report
2017-08-31 15:44:36 +02:00
Laurent Destailleur
6a3d110d3a
Enhance repair for utf8 mix collation
2017-08-31 14:44:32 +02:00
Laurent Destailleur
9146bb336e
Work on merging all payment modes in one page
2017-08-31 03:34:57 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Alexandre SPANGARO
e081653cef
Add fk_projet in table various_payment
2017-08-30 06:38:33 +02:00
Laurent Destailleur
8f01db10a6
Fix setup for india
2017-08-29 13:41:55 +02:00
Laurent Destailleur
e9cdf85286
Fxi repeair of collation
2017-08-29 12:58:18 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
1523b2ef80
FIX #7222
2017-08-28 14:02:08 +02:00
Laurent Destailleur
b4769d37d6
Increase emailing title length
2017-08-28 00:06:38 +02:00
Laurent Destailleur
3f7eea2e0a
NEW Can set language on extrafields
2017-08-27 12:12:02 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
271d0c86c6
Fix sql install
2017-08-26 21:03:13 +02:00
Laurent Destailleur
c08d0aeda5
Clean duplicate accounting account
2017-08-26 21:01:26 +02:00
Laurent Destailleur
03eb870576
Fix sql syntax error
2017-08-26 20:16:12 +02:00
Laurent Destailleur
49a2f4f0c6
Fix sql
2017-08-26 20:13:01 +02:00
Laurent Destailleur
782b85ba13
Merge pull request #7285 from hregis/6.0_bug
...
Fix: avoid error "A non-numeric value encountered"
2017-08-26 19:31:16 +02:00
John
0653a5d177
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec
2017-08-24 14:35:01 +02:00
