Adrien Raze
|
0bd4b132a4
|
FIX : Update pencil should be shoxn only when no payment has been entered
|
2021-03-10 14:39:04 +01:00 |
|
atm-lena
|
b798535af9
|
FIX create sociales : keep values error form
|
2021-03-10 14:15:03 +01:00 |
|
Laurent Destailleur
|
c3a047ee06
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
|
2021-03-08 19:31:47 +01:00 |
|
Laurent Destailleur
|
2f0c4038fb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
|
2021-03-08 19:27:34 +01:00 |
|
Laurent Destailleur
|
7cb10eae2e
|
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation
FIX : Add "Now" link on social charges creation card
|
2021-03-08 16:31:41 +01:00 |
|
Laurent Destailleur
|
20c30bade8
|
Update card.php
|
2021-03-08 16:30:32 +01:00 |
|
Adrien Raze
|
67c6577177
|
FIX : Add "Now" link on social charges card creation
|
2021-03-08 15:47:02 +01:00 |
|
Adrien Raze
|
cbb7751a15
|
FIX : rounding amount on card updating
|
2021-03-08 11:51:18 +01:00 |
|
Laurent Destailleur
|
7d20df8054
|
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
|
2021-03-04 16:53:54 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Gauthier PC portable 024
|
6da28f5e44
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-03-01 11:12:03 +01:00 |
|
Laurent Destailleur
|
0832c25b5b
|
Look and feel v14
|
2021-02-28 11:48:35 +01:00 |
|
Gauthier PC portable 024
|
c996871f98
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-26 11:50:18 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +01:00 |
|
Gauthier PC portable 024
|
939d406ab1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-22 09:10:24 +01:00 |
|
Laurent Destailleur
|
2be6992916
|
Fix include_once into include for inc.php file. See comment in #16338
|
2021-02-19 16:10:19 +01:00 |
|
Gauthier PC portable 024
|
134d7e00ec
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-17 16:56:50 +01:00 |
|
Laurent Destailleur
|
c8824ccea0
|
Look and feel v14
|
2021-02-16 17:05:38 +01:00 |
|
stickler-ci
|
84e17753eb
|
Fixing style errors.
|
2021-02-11 10:35:15 +00:00 |
|
atm-lena
|
a1356718c0
|
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
|
2021-02-11 11:14:24 +01:00 |
|
atm-lena
|
7fbf0b56d5
|
NEW Bank Entries : add verif fk_user addPaymentToBank Social Contribution
|
2021-02-11 11:13:12 +01:00 |
|
atm-lena
|
b83e2dc77a
|
Merge branch 'NEW_BankEntries_TaxSalarySocial_DisplayUser' of github.com:atm-lena/dolibarr into develop_NEW_BankEntries_TaxSalarySocial_DisplayUser
|
2021-02-11 09:52:59 +01:00 |
|
atm-lena
|
8f8f5058de
|
Add link 'user' in bank_url for payment_sc
|
2021-02-10 16:04:29 +01:00 |
|
Frédéric FRANCE
|
f394e55ade
|
deprecate non camelCaps functions
|
2021-02-09 10:26:17 +01:00 |
|
Gauthier PC portable 024
|
df8ca1ef84
|
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
|
2021-02-05 09:29:20 +01:00 |
|
Laurent Destailleur
|
964fa7a72d
|
Look and feel v14
|
2021-02-04 20:29:57 +01:00 |
|
Gauthier PC portable 024
|
e188ec6cd7
|
NEW : add real payments on salaries objects
|
2021-02-04 17:21:08 +01:00 |
|
Laurent Destailleur
|
f301635681
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
|
2021-02-03 21:02:32 +01:00 |
|
Laurent Destailleur
|
348fd0fcb5
|
FIX #16160
|
2021-02-03 19:36:10 +01:00 |
|
Laurent Destailleur
|
dad6778570
|
Prepare removal of libelle and lib into label
|
2021-01-31 13:07:41 +01:00 |
|
Gauthier PC portable 024
|
b55cb826e7
|
Merge branch 'NEW_develop/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge
|
2021-01-29 09:33:06 +01:00 |
|
Gauthier PC portable 024
|
2915bf89d9
|
FIX : stickler feedback on br tag
|
2021-01-29 09:32:00 +01:00 |
|
stickler-ci
|
b4d0668cea
|
Fixing style errors.
|
2021-01-28 16:27:55 +00:00 |
|
Gauthier PC portable 024
|
0c43ea1e9b
|
Merge branch 'NEW/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge
|
2021-01-28 17:16:24 +01:00 |
|
Gauthier PC portable 024
|
cce38a9e6d
|
NEW : fk_user on social charge
|
2021-01-28 16:58:55 +01:00 |
|
Alexandre SPANGARO
|
1f87bbbd01
|
Typo
|
2021-01-07 06:26:24 +01:00 |
|
Laurent Destailleur
|
5facd49a6c
|
Fix warnings
|
2020-12-16 11:33:31 +01:00 |
|
Laurent Destailleur
|
d4167fb06c
|
Fix link
|
2020-12-14 11:35:45 +01:00 |
|
Laurent Destailleur
|
e1e8d76eb9
|
Fix bad filter
|
2020-12-14 11:30:39 +01:00 |
|
Laurent Destailleur
|
07cf81be17
|
Fix search and navigation
|
2020-12-14 11:28:18 +01:00 |
|
Laurent Destailleur
|
b0e3f1678f
|
Debug v13
|
2020-12-14 10:58:09 +01:00 |
|
Laurent Destailleur
|
cce0b2f31b
|
Fix code
|
2020-12-14 10:44:51 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
3c5ef18b36
|
FIX #15390
|
2020-11-14 00:47:28 +01:00 |
|
Laurent Destailleur
|
ed8a0093ff
|
Debug v13
|
2020-11-05 22:25:14 +01:00 |
|
Frédéric FRANCE
|
6c3ecc600d
|
Update card.php
|
2020-11-03 21:02:57 +01:00 |
|
Laurent Destailleur
|
508683b9f0
|
Clean duplicated code
|
2020-11-03 14:52:04 +01:00 |
|
Laurent Destailleur
|
b0e2d40533
|
Debug and fix v13
|
2020-11-03 14:19:54 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
6fa174d13f
|
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
11878 - select the only bank account
|
2020-10-25 14:56:08 +01:00 |
|
Laurent Destailleur
|
a7b23dc4f6
|
Update chargesociales.class.php
|
2020-10-25 14:14:50 +01:00 |
|
Laurent De Coninck
|
1d62834b2c
|
use the second version for default bank account
|
2020-10-24 17:15:48 +02:00 |
|
Frédéric FRANCE
|
f4181a77cd
|
Update chargesociales.class.php
|
2020-10-24 13:53:00 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent De Coninck
|
d2e2cad028
|
select by default, remove the show empty everywhere the field is required
|
2020-10-17 21:15:52 +02:00 |
|
Laurent Destailleur
|
7504f92a41
|
Standardize code and look and feel
|
2020-10-16 13:30:20 +02:00 |
|
stickler-ci
|
675b1e613b
|
Fixing style errors.
|
2020-10-12 12:05:38 +00:00 |
|
Sekan, Tobias
|
3b905bdcd5
|
Selectable columns on social taxes list
|
2020-10-12 14:00:33 +02:00 |
|
Laurent Destailleur
|
663f149982
|
Better error management
|
2020-10-06 16:48:48 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
216b3c885d
|
Fix escaping
|
2020-09-20 01:30:36 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
970995d728
|
Clean code. Replace num_paiement with num_payment everywhere.
|
2020-09-14 01:03:51 +02:00 |
|
Laurent Destailleur
|
52f238a351
|
Fix label
|
2020-07-25 14:50:09 +02:00 |
|
Laurent Destailleur
|
bd63b84f8e
|
Fix label of social contribution and button date
|
2020-07-09 23:18:19 +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
|
a11f7d1070
|
Update list.php
|
2020-06-28 21:11:25 +02:00 |
|
Alexandre SPANGARO
|
0c60c9fd0d
|
FIX: SQL Problem in social contribution list
|
2020-06-25 20:53:03 +02:00 |
|
Laurent Destailleur
|
5669eb81af
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 15:39:50 +02:00 |
|
Laurent Destailleur
|
919cc0da87
|
Fix num payment
|
2020-06-06 15:39:18 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
f5688b2eec
|
add new rule
|
2020-05-21 01:52:25 +02:00 |
|
Laurent Destailleur
|
1121d2c1c6
|
Look and feel v12
|
2020-04-25 13:49:44 +02:00 |
|
Laurent Destailleur
|
731864eb4a
|
Removed useless translation keys
|
2020-04-25 12:43:41 +02:00 |
|
Laurent Destailleur
|
67a7d6b77d
|
Look and feel v12
|
2020-04-20 15:57:15 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Laurent Destailleur
|
5254a94038
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
|
2020-04-16 15:58:59 +02:00 |
|
atm-quentin
|
f7c07640dd
|
viewstatut to search_status
|
2020-04-15 15:01:00 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
84cda962c1
|
Clean dead code
|
2020-04-02 12:03:29 +02:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
73f2e9e5de
|
WIP migrate num_paiement into num_payment
Fix label for free product in takepos
|
2020-03-16 19:23:18 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
52c7f908a0
|
Doxygen
|
2020-02-20 14:02:27 +01:00 |
|
Laurent Destailleur
|
e73d83767c
|
Fix phpcs
|
2020-02-20 12:35:48 +01:00 |
|
Laurent Destailleur
|
7796724d63
|
Update list.php
|
2020-02-20 01:07:41 +01:00 |
|
Laurent Destailleur
|
960302c012
|
Merge branch 'develop' into patch-35
|
2020-02-20 01:07:08 +01:00 |
|
Pierre Ardoin
|
bebc37abe3
|
Update list.php
|
2020-02-19 08:54:10 +01:00 |
|
Pierre Ardoin
|
34d7fb887f
|
Show project Ref support if enable
Add search and Project Ref column in the list, only if project module is enable.
|
2020-02-19 08:50:49 +01:00 |
|
stickler-ci
|
416cb3016d
|
Fixing style errors.
|
2020-02-11 13:15:23 +00:00 |
|
oscim
|
8b67793409
|
report and apply GETPOST method
report and apply GETPOST method for $dateech, $dateperiod, $label
|
2020-02-11 14:13:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
e1123c63a9
|
Fix field label
|
2020-01-23 19:42:00 +01:00 |
|
Laurent Destailleur
|
b74d37338b
|
Fix trans
|
2020-01-23 19:37:34 +01:00 |
|
Laurent Destailleur
|
a44d534e64
|
Fix label
|
2020-01-23 19:32:34 +01:00 |
|
Laurent Destailleur
|
423be8a139
|
FIX Label of status of social contribution
|
2020-01-23 19:30:02 +01:00 |
|
Laurent Destailleur
|
5a702eb50c
|
Fix filter on amount
|
2020-01-19 19:55:57 +01:00 |
|
Laurent Destailleur
|
fe6bcd8a31
|
Fix missing value in popup
|
2020-01-17 14:32:22 +01:00 |
|
Laurent Destailleur
|
8202a67e4e
|
Fix look and feel v11
|
2019-12-25 23:15:56 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Alexandre SPANGARO
|
659e3aca8e
|
Look & field v11
|
2019-11-26 21:14:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
c66bce7ec6
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 17:31:18 +00:00 |
|
stickler-ci
|
fae5d56d34
|
Fixing style errors.
|
2019-11-10 10:04:11 +00:00 |
|
Philippe GRAND
|
b0d68a6de1
|
add some comment
|
2019-11-10 11:05:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
812d0af1d9
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 14:51:54 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
stickler-ci
|
4480d7dd88
|
Fixing style errors.
|
2019-11-04 14:09:43 +00:00 |
|
Philippe GRAND
|
2909f8141e
|
fix translation
|
2019-11-04 15:08:43 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +01:00 |
|
Laurent Destailleur
|
82bda63920
|
Merge pull request #12296 from frederic34/patch-20
Update index.php
|
2019-11-02 10:09:55 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
8b98df296f
|
Update info.php
|
2019-11-01 17:36:11 +01:00 |
|
Frédéric FRANCE
|
38b86d4bde
|
Update payments.php
|
2019-11-01 17:30:49 +01:00 |
|
Frédéric FRANCE
|
61873aa1a8
|
Update list.php
|
2019-11-01 17:29:21 +01:00 |
|
Philippe Grand
|
9fad5dc8fc
|
Update chargesociales.class.php
|
2019-11-01 11:16:47 +01:00 |
|
stickler-ci
|
0c6938aa2a
|
Fixing style errors.
|
2019-11-01 09:44:29 +00:00 |
|
Philippe GRAND
|
4fe3e49502
|
add some comment
|
2019-11-01 10:42:14 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Laurent Destailleur
|
607c38775d
|
Use popup
|
2019-10-31 14:57:05 +01:00 |
|
Laurent Destailleur
|
360b3a9550
|
NEW Ask the new label and new dates in confirm popup when cloning tax
|
2019-10-31 14:06:26 +01:00 |
|
Frédéric FRANCE
|
a1f0245c79
|
clean indent in compta, contact directory
|
2019-10-26 18:13:20 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
ea008aefd7
|
Update chargesociales.class.php
|
2019-09-30 20:21:10 +02:00 |
|
Frédéric FRANCE
|
0c908fb4ed
|
Update chargesociales.class.php
|
2019-09-30 20:13:43 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
bb81f66a1a
|
Add phpunit test for Lessc
|
2019-09-06 10:36:49 +02:00 |
|
Laurent Destailleur
|
999db7ed41
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
|
2019-08-26 16:49:25 +02:00 |
|
Laurent Destailleur
|
7c5fc9f3f8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-08-26 16:43:33 +02:00 |
|
Laurent Destailleur
|
c93e6550ce
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-08-26 16:43:24 +02:00 |
|
Laurent Destailleur
|
dcfbba9af5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-08-26 16:41:06 +02:00 |
|